Compare commits

..
Author SHA1 Message Date
jason.woltje 6fe3625fae fix(webui): sp17 review 2, a new step typed in the add form is not dropped by Save: the bar's Save with a typed new step says it is not added yet, keeps the form and puts the caret in its title, and an add form with nothing typed is closed and the rest saved; test types a new step and presses the bar's Save, sees the words and no write, then adds the step and sees all three in the write (red before: Save wrote without the new step and said Saved); the pack apply test waits for the autonomy read as well as the workflows read, as it answered later on a loaded host (#1873, lane sp17-workflow-clicks) 2026-11-16 12:36:33 -06:00
jason.woltje 24551c9eea fix(webui): sp17 review, no edit is dropped without a word: an open edit of one step goes into the pending workflow as typed when another step is drawn or typed in (a card step link, the address or Back opened it), so Save sends both and Reset step on the second puts back only that one, and a step the save check refuses is named by Save, which checks every step; while a Save or delete is in flight the step and workflow forms' fields are off, drawn off when busy and set off on a held form, and on again after the answer or a refusal, so nothing typed then is lost when the form is drawn again; tests open step 2 from the card and from the address with step 1 changed and see both in the write (red before: step 1 went back to Build), and check the fields are off during a held write and a redraw and on after it and after a refusal (red before: the fields stayed on) (#1873, lane sp17-workflow-clicks) 2026-11-16 12:36:33 -06:00
jason.woltje cad9cd057f fix(webui): sp17 shots, the path reads right at 390 and in both modes: a step link lands with the title and the Save under it both in view (at 390 Save was below the fold), a Save with nothing to save is drawn off rather than in the action colour, and after Save the focus stays in the form it was saved from so the line saying Saved stays in view (at 390 the jump to the graph node put it off screen); the three-clicks test checks the title, Save and the Saved line are in view and the focus is kept (red before: Save in view at 390, and the focus and Saved line on three of four cases) (#1873, lane sp17-workflow-clicks) 2026-11-16 12:36:33 -06:00
jason.woltje 4f24501801 fix(webui): sp17 one field of one step saves in three clicks, one workflow editor, and an edit kept through a bus restart: each workflow on the organization's Workflows card lists its steps as links, and a step link opens that step's form with the caret in its title, so the path is the organization in the sidebar, the step on the card, Save (3 clicks at 1440, 4 at 390 with the menu, 2 from the organization's own page; it was 6); Delete keeps its confirm; the old form editor on the organization page and its rules are gone, since the graph page's step and workflow forms cover each field it changed; a failed workflows read keeps drawing the last read with the pending change and says the read failed; a poll keeps an open step form whose step another writer did not change; the card names each held change with a link back to it, also while the bus is stopped, where it said only that the bus was stopped; tests count real pointer clicks on the path, open a step edit through a bus restart, a stop and a return, and press Restart bus with an edit held, and save it after (red before the card note: the stopped card did not name the edit) (#1873, lane sp17-workflow-clicks) 2026-11-16 12:36:33 -06:00
jason.woltje 02e053866a fix(webui): sp17 a Save in flight holds the workflow poll: each organization counts its workflow writes, and a read that began before a write ended, or answers while one is in flight, is dropped so it cannot draw the file from before the Save over the saved step; the page takes the saved workflow and the revision from the write's answer instead of reading again; the test holds the write, starts a poll whose read holds the old file, lets the write answer and then the read, and sees the saved title and a second Save on the answered revision (red before the fix: the step went back to Ship) (#1873, lane sp17-workflow-clicks) 2026-11-16 12:36:33 -06:00
jason.woltje ff096afa27 fix(webui): sp16 review 3, a kept packs answer of no use for this hire is read again at once: a refusal or no answer is read again on each render, at most one read open, so the template line recovers with the route instead of saying not read for 60 s; an answer that does not name this hire (a hire made after it was read) is read again once per hire until the keep runs out, and the line says the template is being read, not that the pack does not name it, until that read answers and repaints the drawer; a hire the pack really does not name says so after one read and makes no read on each repaint; the drawer's second look after its race starts no read, so a render makes at most one packs read; the quiet refresh at 60 s still draws the kept answer with no swap; tests pin a later hire, a hire the pack does not name, a 503 that recovers and the 60 s refresh (#1873, lane sp16-drawer-actions) 2026-11-16 12:01:02 -06:00
jason.woltje 70af20e29d fix(webui): sp16 review 2, the drawer shows the state as soon as it is read and the template line holds still: when the instances read answers after the page, the drawer repaints at once with the state, and a pack hire's template line says being read until its packs read answers and repaints it (data-drawer-pending names <n> for the instances read and <n>p for the packs read, and a repaint waiting on the fresh drawer runs at the swap); the packs answer is kept per organization for 60 s and a repaint draws from it, also while a newer read is open, so the line no longer goes back to being read on every poll and one read serves the repaints; a drawer whose reads have all answered is no longer marked pending and swapped after paint; the Role row of a pack hire says Hired and the pack is named once, in Hired from; the unreachable holds-no-conversation line is gone; Last activity for a conversation agent reads not shown: reading it means reading the whole conversation; tests pin one packs read across three repaints, the state shown while packs is held, and no pending marker when all reads are in (#1873, lane sp16-drawer-actions) 2026-11-16 11:46:38 -06:00
jason.woltje d92cdefc1d fix(webui): sp16 review, the packs read never holds the page and never breaks the drawer: a pack hire's packs read is raced against the page's reads as the instances read is, so a slow one shows the template as being read and repaints the drawer when it answers, and the instances read is let go once it answers so a held packs read never keeps a stale state; a packs answer that is not JSON says not read: no answer instead of leaving no drawer; Hired from names the pack by the label the installed pack carries, since the instance names only its id (the test stub now gives the instance the bus's shape); Last activity for an agent holding a conversation says the drawer does not read it, since that thread's messages read pages from the oldest message, and not recorded stays for the rest; where no Message is offered the line says the state is being read, gives the reason a failed read gives, or says a copy is not messaged from here; a 401 reads as signed out (#1873, lane sp16-drawer-actions) 2026-11-16 11:46:38 -06:00
jason.woltje 9994f89790 feat(webui): sp16 the agent drawer says what it can about an agent and why it can not act: Last activity reads not recorded, since no read the Console makes carries the time of an agent's last message or run (the agents read's time is the role claim, since the start of its present state); a pack hire shows Hired from with its pack and the template the installed pack's hire names, from the existing owner-only packs read, made only for a pack hire, and says not read with the reason when that read is refused; where no Message is offered one line says why; a drawer whose instances read answers after its HTML is built and before the page carrying it is on screen repaints once that page is painted, instead of staying on Reading state until the next poll; the organization page's Workflows card moves under Active agent sessions so the left column is not empty below the sessions. No Restart: no route restarts one agent (#1873, lane sp16-drawer-actions) 2026-11-16 11:46:38 -06:00
11 changed files with 1260 additions and 472 deletions

No files matched your search

+2
View File
@@ -1949,6 +1949,8 @@
if (k) restore(k);
// Message on the Board (row 95) lands in the form it opened, addressed to the role.
else if (focusSend && $('send-body')) { $('send-body').focus(); announce(`Message to ${draft.to}`); }
// SP17: a step link on an organization's Workflows card lands in that step's title field.
else if (navigated && window.MosaicWorkflows?.landed?.()) { /* landed() focused the field and said so */ }
else if (navigated && h1) { const target=settingsFocusDisclosure&&path.startsWith('/settings/') ? $('settings-disclosure') : path.startsWith('/settings/') ? ($('settings-page-title')||h1) : h1; settingsFocusDisclosure=false; target.focus(); announce(target.textContent); }
focusSend = false;
window.MosaicWorkspace?.afterPaint?.();
+8 -11
View File
@@ -1,22 +1,19 @@
[data-packs],[data-workflows]{margin-top:16px}
:is(.pack-list,.pack-hires,.wf-list){list-style:none;margin:8px 0;padding:0}
:is(.pack-row,.pack-hire,.wf-item){border-top:1px solid var(--border);padding:12px 0;overflow-wrap:anywhere}
.pack-list,.pack-hires{list-style:none;margin:8px 0;padding:0}
.pack-row,.pack-hire{border-top:1px solid var(--border);padding:12px 0;overflow-wrap:anywhere}
.pack-preview{border:1px solid var(--border);border-radius:var(--r);padding:12px;margin:12px 0;overflow-wrap:anywhere}
.pack-preview .ws-tbl{overflow-x:auto}
/* E2E6 P2-3: the preview's overflow-wrap:anywhere let the table squeeze words ("Workfl ow"). Cells wrap
at word breaks; only a path, which has none, may break anywhere. */
.pack-preview .ws-tbl :is(td,th){overflow-wrap:normal;word-break:normal}
.pack-preview .ws-tbl td code{overflow-wrap:anywhere}
.pack-nohire,.wf-missing,.wf-note{color:var(--danger)}
.pack-nohire,.wf-missing{color:var(--danger)}
.wf-missing{font-size:.9em}
.wf-steps{margin:6px 0;padding-left:22px}.wf-steps li{margin:4px 0}
.wf-editor{display:grid;gap:12px;margin:12px 0}
.wf-step{border:1px solid var(--border);border-radius:var(--r);padding:12px;display:grid;gap:10px;min-width:0}
:is(.wf-editor,[data-packs]) label{display:flex;flex-direction:column;gap:6px;min-width:0}
:is(.wf-editor,[data-packs]) :is(select,input,textarea){width:100%;box-sizing:border-box;min-height:44px;padding:8px 12px;border:1px solid var(--border);border-radius:var(--r);background:var(--canvas);color:var(--text);font:inherit}
:is([data-packs],[data-workflows]) .btn{min-height:44px;margin:4px 8px 4px 0}
:is([data-packs],[data-workflows]) :is(button,select,input,textarea):focus-visible{outline:2px solid var(--focus);outline-offset:2px}
:is([data-packs],[data-workflows]) [role=status]{overflow-wrap:anywhere}
[data-packs] label{display:flex;flex-direction:column;gap:6px;min-width:0}
[data-packs] :is(select,input,textarea){width:100%;box-sizing:border-box;min-height:44px;padding:8px 12px;border:1px solid var(--border);border-radius:var(--r);background:var(--canvas);color:var(--text);font:inherit}
[data-packs] .btn{min-height:44px;margin:4px 8px 4px 0}
[data-packs] :is(button,select,input,textarea):focus-visible{outline:2px solid var(--focus);outline-offset:2px}
[data-packs] [role=status]{overflow-wrap:anywhere}
.pack-applied{border-left:3px solid var(--border);padding:4px 0 4px 12px;margin:8px 0}
.pack-applied p{margin:0 0 6px}
.pack-open{list-style:none;margin:6px 0 8px;padding:0}
+16 -2
View File
@@ -52,14 +52,23 @@
.wfg-cardlist a{display:block;padding:8px 0;color:var(--text);text-decoration:none;overflow-wrap:anywhere}
.wfg-cardlist a:hover strong{text-decoration:underline}
.wfg-cardlist strong{color:var(--action,var(--accent))}
/* SP17: each step of a workflow as a link to its form, under the workflow's link. */
.wfg-cardlist .wfg-card-steps{list-style:none;display:flex;flex-wrap:wrap;gap:2px 0;margin:-4px 0 0;padding:0 0 8px;font-size:13px}
.wfg-cardlist .wfg-card-steps li{display:inline-flex;align-items:center;border:0}
.wfg-cardlist .wfg-card-steps li+li::before{content:"\2192";color:var(--muted);padding:0 6px}
.wfg-cardlist .wfg-card-steps a{display:inline-block;padding:4px 0;color:var(--action,var(--accent));text-decoration:underline;text-decoration-color:color-mix(in srgb,currentColor 40%,transparent);text-underline-offset:2px}
.wfg-cardlist .wfg-card-steps a:hover{text-decoration-color:currentColor}
.wfg-card [data-wfg-none]{margin:0 0 8px}
.wfg-card p:last-child{margin-bottom:0}
/* SP10 (#1873): editing a workflow in its graph. The bar above the graph holds Unsaved, Discard, Save and
Delete workflow; the step panel holds the step actions and the step form; the list page holds New workflow. */
/* SP10 (#1873): editing a workflow in its graph. The bar above the graph holds Unsaved, Discard and Delete
workflow; the step panel holds the step's form with Save (SP17) and the step actions; the list page holds
New workflow. */
html[data-organizations] :is(.wfg-bar,.wfg-step-acts,.wfg-form,.wfg-new) .ws-btn{min-height:32px}
html[data-organizations] :is(.wfg-bar,.wfg-form) .ws-btn.primary{background:var(--action);color:var(--onAction);border-color:var(--action)}
html[data-organizations] :is(.wfg-bar,.wfg-form) .ws-btn.primary:hover:not(:disabled){background:color-mix(in srgb,var(--action) 88%,var(--strong))}
/* SP17 shots: a Save with nothing to save reads as off, not as the action colour. */
html[data-organizations] :is(.wfg-bar,.wfg-form) .ws-btn.primary:disabled{background:var(--raised);color:var(--muted);border-color:var(--line)}
html[data-organizations] :is(.wfg-bar,.wfg-step-acts) .ws-btn.danger{color:var(--danger)}
html[data-organizations] :is(.wfg-bar,.wfg-step-acts,.wfg-form,.wfg-new) .ws-btn:focus-visible{outline:2px solid var(--focus);outline-offset:2px}
.wfg-bar{display:flex;flex-wrap:wrap;align-items:center;gap:8px 12px;margin:0 0 10px}
@@ -75,6 +84,11 @@ html[data-organizations] :is(.wfg-bar,.wfg-step-acts,.wfg-form,.wfg-new) .ws-btn
.wfg-form h2{margin:0}
.wfg-form h3{font-size:14px;margin:6px 0 0}
.wfg-form>label,.wfg-form label:has(>select){display:grid;gap:4px;font-size:13px;color:var(--muted)}
.wfg-form [hidden]{display:none!important}
.wfg-form textarea{font:14px/1.4 var(--font);color:var(--text);background:var(--canvas);border:1px solid var(--line);border-radius:6px;padding:6px 8px;min-width:0;max-width:100%;resize:vertical}
.wfg-form>label:has(>textarea){display:grid;gap:4px;font-size:13px;color:var(--muted)}
.wfg-form textarea:focus-visible{outline:2px solid var(--focus);outline-offset:1px}
.wfg-stepform,.wfg-metaform{margin:0 0 14px}
.wfg-form input:not([type=checkbox]),.wfg-form select{font:14px/1.4 var(--font);color:var(--text);background:var(--canvas);border:1px solid var(--line);border-radius:6px;padding:6px 8px;min-width:0;max-width:100%}
.wfg-form :is(input,select):focus-visible{outline:2px solid var(--focus);outline-offset:1px}
.wfg-form .note{margin:0}
+281 -217
View File
@@ -1,9 +1,11 @@
// Starter packs SP6 (#1873, design section 8): the owner's workflow list and editor on an
// organization's page. GET /api/orgs/<id>/workflows reads the org's and each code project's workflows
// with the file revision; a save is POST .../workflows/<name> {revision, workflow, project?} and a delete
// DELETE .../workflows/<name> {revision, project?} (workflow.set.console). The bus checks the shape; this
// page marks a step role that resolves to no org definition or role template (and is not `human`) as
// naming no current role. Every organization-supplied string goes through esc.
// Starter packs SP6 (#1873, design section 8): an organization's workflows. GET /api/orgs/<id>/workflows reads
// the org's and each code project's workflows with the file revision; a save is POST .../workflows/<name>
// {revision, workflow, project?} and a delete DELETE .../workflows/<name> {revision, project?}
// (workflow.set.console). The bus checks the shape; this page marks a step role that resolves to no org
// definition or role template (and is not `human`) as naming no current role. Every organization-supplied
// string goes through esc.
// SP17: the graph page is the one editor. The organization page's old form editor is gone; its card links to
// each workflow and each step, and a step's panel is its edit form with Save.
(() => {
'use strict';
const esc = x => String(x ?? '').replace(/[&<>"']/g, c => ({ '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]));
@@ -44,91 +46,37 @@
s.data = value;
s.known = new Set([...(value.roles.definitions || []), ...(value.roles.templates || []), 'human']);
}
// E2E6 P1-1: a poll reloads the data but keeps the page's own state: an open editor and its draft,
// a pending delete confirmation and the last receipt.
// SP17: a write in flight holds the poll. Each organization counts its writes (epoch moves when one starts
// and when it ends); a read that began before a write ended, or answers while one is in flight, is dropped
// and the page keeps what it has, which the write's answer brings up to date (written()).
const writes = new Map();
const writeState = org => { if (!writes.has(org)) writes.set(org, { epoch: 0, inflight: 0 }); return writes.get(org); };
async function writing(org, fn) {
const w = writeState(org);
w.epoch++; w.inflight++;
try { return await fn(); } finally { w.inflight--; w.epoch++; }
}
async function load(org) {
const prev = states.get(org);
const s = { data: null, known: new Set(), error: null, editing: prev?.editing ?? null, confirm: prev?.confirm ?? null, status: prev?.status ?? '' };
try { await read(org, s); } catch (error) {
// Review P3: a failed poll while an editor is open keeps the last good read, so the fresh section
// still carries its data-live-key and graftLive puts the held section, editor and focus back.
if (prev?.editing && prev.data) Object.assign(s, { data: prev.data, known: prev.known });
const prev = states.get(org), w = writeState(org), began = w.epoch;
const s = { data: null, known: new Set(), error: null };
const raced = () => !!prev?.data && (w.inflight > 0 || w.epoch !== began);
try { await read(org, s); if (raced()) return; } catch (error) {
if (raced()) return;
// Review P3: a failed poll while a change to this organization's workflows is held keeps the last good
// read, so the page still draws the change and its form, and graftLive puts the held form and focus back.
// SP17: the failure is still said; the page draws the last read under that line.
if (prev?.data && held(org).length) Object.assign(s, { data: prev.data, known: prev.known, readError: error.message });
else s.error = error.message;
}
states.set(org, s);
}
const scopes = s => [['', 'Organization', s.data.workflows], ...Object.keys(s.data.projects).sort().map(p => [p, `Project ${p}`, s.data.projects[p]])];
const roleChip = (s, role) => s.known.has(role)
? `<code>${esc(role)}</code>`
: `<code>${esc(role)}</code> <span class="wf-missing" data-wf-missing>${MISSING}</span>`;
function stepItem(s, step) {
const roles = Array.isArray(step?.roles) ? step.roles : [];
return `<li data-wf-step><span>${esc(step?.title)}</span> <span class="muted">${esc(STATE_LABEL[step?.state] ?? step?.state)}</span> <span class="wf-roles">${roles.map(r => roleChip(s, r)).join(', ')}</span></li>`;
}
function workflowItem(org, s, scope, name, w) {
const steps = Array.isArray(w?.steps) ? w.steps : [];
const confirm = s.confirm && s.confirm.scope === scope && s.confirm.name === name;
const actions = !s.data.writable ? '' : confirm
? `<p>Delete this workflow? <button class="btn" type="button" data-wf-delete-yes data-focus-key="${esc(`wf-yes:${scope}:${name}`)}">Delete</button> <button class="btn" type="button" data-wf-delete-no data-focus-key="${esc(`wf-no:${scope}:${name}`)}">Keep</button></p>`
: `<p><button class="btn" type="button" data-wf-edit data-focus-key="${esc(`wf-edit:${scope}:${name}`)}">Edit</button> <button class="btn" type="button" data-wf-delete data-focus-key="${esc(`wf-delete:${scope}:${name}`)}">Delete</button></p>`;
return `<li class="wf-item" data-wf="${esc(name)}" data-wf-scope="${esc(scope)}"><strong data-wf-title>${esc(w?.title || name)}</strong> <span class="muted"><code>${esc(name)}</code></span>
${w?.description ? `<p>${esc(w.description)}</p>` : ''}<ol class="wf-steps">${steps.map(st => stepItem(s, st)).join('')}</ol>${actions}</li>`;
}
function stepRow(s, step, i) {
const roles = step.roles.split(',').map(r => r.trim()).filter(Boolean);
const missing = roles.filter(r => !s.known.has(r));
return `<fieldset class="wf-step" data-wf-edit-step="${i}"><legend>Step ${i + 1}</legend>
<label>Title<input name="title" maxlength="120" value="${esc(step.title)}" autocomplete="off"></label>
<label>State<select name="state">${STATES.map(([v, l]) => `<option value="${v}"${step.state === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label>
<label>Roles, separated by commas<input name="roles" value="${esc(step.roles)}" autocomplete="off"></label>
<p class="wf-note" data-wf-step-missing>${missing.length ? `${missing.map(r => `<code>${esc(r)}</code>`).join(', ')} ${MISSING}` : ''}</p>
<button class="btn" type="button" data-wf-step-remove>Remove step</button></fieldset>`;
}
function editor(s) {
const e = s.editing;
if (!e) return '';
const scopeField = e.isNew
? `<label>Where<select name="scope">${scopes(s).map(([v, l]) => `<option value="${esc(v)}"${e.scope === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label><label>Name<input name="name" maxlength="64" value="${esc(e.name)}" autocomplete="off" placeholder="lowercase letters, digits, dashes"></label>`
: `<p>${e.scope ? `Project ${esc(e.scope)}` : 'Organization'}, <code>${esc(e.name)}</code></p>`;
return `<form class="wf-editor" data-wf-editor data-live-hold><h4>${e.isNew ? 'New workflow' : 'Edit workflow'}</h4>${scopeField}
<label>Title<input name="title" maxlength="120" value="${esc(e.draft.title)}" autocomplete="off"></label>
<label>Description<textarea name="description" maxlength="1000" rows="2">${esc(e.draft.description)}</textarea></label>
${e.draft.steps.map((st, i) => stepRow(s, st, i)).join('')}
<p><button class="btn" type="button" data-wf-step-add>Add step</button> <button class="btn" type="submit">Save workflow</button> <button class="btn" type="button" data-wf-cancel>Cancel</button></p>
<p class="note">Roles name an organization role, a role template, or <code>human</code>.</p></form>`;
}
function section(org) {
const s = states.get(org);
if (!s || s.error) return `<section class="panel" data-workflows data-workflows-org="${esc(org)}"><h3>Workflows</h3><p>${esc(s?.error ?? 'Workflows could not be read.')}</p></section>`;
const lists = scopes(s).map(([scope, label, flows]) => {
const names = Object.keys(flows || {}).sort();
return `<div class="wf-scope" data-wf-scope-list="${esc(scope)}"><h4>${esc(label)}</h4>${names.length ? `<ul class="wf-list">${names.map(n => workflowItem(org, s, scope, n, flows[n])).join('')}</ul>` : '<p class="note">No workflows.</p>'}</div>`;
}).join('');
const add = s.data.writable ? (s.editing ? '' : `<p><button class="btn" type="button" data-wf-new data-focus-key="${esc(`wf-new:${org}`)}">New workflow</button></p>`) : '<p class="note">Only the owner, on a Console started with send, can change workflows.</p>';
return `<section class="panel" data-workflows data-workflows-org="${esc(org)}" data-live-key="${esc(`workflows:${org}`)}"><h3>Workflows</h3><p>A workflow lists the steps a task goes through, the state each step puts it in and the roles that do it.</p>${lists}${add}${editor(s)}<p role="status" data-workflows-status>${esc(s.status)}</p></section>`;
}
function redraw(org) {
const el = [...document.querySelectorAll('[data-workflows-org]')].find(n => n.dataset.workflowsOrg === org);
if (el) el.outerHTML = section(org);
}
// The editor's current values back into the draft, so adding or removing a step keeps what was typed.
function capture(root, s) {
const form = root.querySelector('[data-wf-editor]');
if (!form || !s.editing) return;
const e = s.editing;
if (e.isNew) { e.scope = form.elements.scope?.value ?? e.scope; e.name = form.elements.name?.value ?? e.name; }
e.draft.title = form.querySelector(':scope > label > input[name="title"]').value;
e.draft.description = form.elements.description.value;
e.draft.steps = [...form.querySelectorAll('[data-wf-edit-step]')].map(f => ({ title: f.querySelector('[name="title"]').value, state: f.querySelector('[name="state"]').value, roles: f.querySelector('[name="roles"]').value }));
}
const flowsIn = (s, scope) => scope ? s.data.projects[scope] : s.data.workflows;
const target = (s, scope) => scope ? { project: scope } : {};
// SP10: the one check, body and write both editors use, the organization page's form and the graph.
// A step is {title, state, roles: [names]}. The order of the checks is the form's: the name, a name the
// scope already holds, a role that names no current role, then the shape the bus checks (organization-config
// checkWorkflows: 1 to 20 steps, each with a title and 1 to 8 distinct roles), named here before the bus
// refuses it in general words.
const rolesIn = text => String(text ?? '').split(',').map(r => r.trim()).filter(Boolean);
// SP10: the save check. A step is {title, state, roles: [names]}. The order of the checks: the name, a name
// the scope already holds, a role that names no current role, then the shape the bus checks
// (organization-config checkWorkflows: 1 to 20 steps, each with a title and 1 to 8 distinct roles), named
// here before the bus refuses it in general words.
function stepRefusal(st, n) {
if (!String(st.title ?? '').trim()) return `Step ${n} needs a title.`;
if (!st.roles.length) return `Step ${n} needs at least one role.`;
@@ -157,74 +105,6 @@
// The revision is the one the editor opened on: a change made since then is a revision-conflict, not overwritten.
const saveFlow = (org, s, { scope, name, revision, workflow }) => call(flowUrl(org, name), 'POST', { revision, workflow, ...target(s, scope) });
const removeFlow = (org, s, { scope, name, revision }) => call(flowUrl(org, name), 'DELETE', { revision, ...target(s, scope) });
async function reload(org, s, status) {
try { await read(org, s); s.status = status; } catch (error) { s.status = `${status} ${error.message}`; }
}
document.addEventListener('click', async ev => {
const button = ev.target.closest('[data-wf-new],[data-wf-edit],[data-wf-cancel],[data-wf-step-add],[data-wf-step-remove],[data-wf-delete],[data-wf-delete-yes],[data-wf-delete-no]');
if (!button) return;
const root = button.closest('[data-workflows-org]'), org = root?.dataset.workflowsOrg, s = states.get(org);
if (!s?.data) return;
const item = button.closest('[data-wf]'), scope = item?.dataset.wfScope ?? '', name = item?.dataset.wf;
if (button.hasAttribute('data-wf-new')) {
s.editing = { isNew: true, revision: s.data.revision, scope: '', name: '', draft: { title: '', description: '', steps: [{ title: '', state: 'todo', roles: '' }] } };
} else if (button.hasAttribute('data-wf-edit')) {
const w = flowsIn(s, scope)?.[name];
s.editing = { isNew: false, revision: s.data.revision, scope, name, draft: { title: w?.title ?? '', description: w?.description ?? '', steps: (w?.steps ?? []).map(st => ({ title: st.title ?? '', state: st.state ?? 'todo', roles: (st.roles ?? []).join(', ') })) } };
} else if (button.hasAttribute('data-wf-cancel')) {
s.editing = null;
} else if (button.hasAttribute('data-wf-step-add')) {
capture(root, s); s.editing.draft.steps.push({ title: '', state: 'todo', roles: '' });
} else if (button.hasAttribute('data-wf-step-remove')) {
capture(root, s); s.editing.draft.steps.splice(Number(button.closest('[data-wf-edit-step]').dataset.wfEditStep), 1);
} else if (button.hasAttribute('data-wf-delete')) {
s.confirm = { scope, name };
} else if (button.hasAttribute('data-wf-delete-no')) {
s.confirm = null;
} else if (button.hasAttribute('data-wf-delete-yes')) {
button.disabled = true;
try {
await removeFlow(org, s, { scope, name, revision: s.data.revision });
s.confirm = null;
await reload(org, s, `Deleted ${name}.`);
} catch (error) { s.status = error.message; }
}
redraw(org);
});
// Every keystroke goes back into the draft, so any repaint draws what was typed.
document.addEventListener('input', ev => {
const form = ev.target.closest('[data-wf-editor]'), root = form?.closest('[data-workflows-org]');
if (form && root) { const st = states.get(root.dataset.workflowsOrg); if (st?.editing) capture(root, st); }
const field = ev.target.closest('[data-wf-edit-step] [name="roles"]');
if (!field) return;
const s = states.get(field.closest('[data-workflows-org]')?.dataset.workflowsOrg);
if (!s) return;
const missing = field.value.split(',').map(r => r.trim()).filter(r => r && !s.known.has(r));
// textContent and created nodes only: a typed name never becomes markup.
const note = field.closest('[data-wf-edit-step]').querySelector('[data-wf-step-missing]');
note.textContent = missing.length ? `${missing.join(', ')} ${MISSING}` : '';
});
document.addEventListener('submit', async ev => {
if (!ev.target.matches('[data-wf-editor]')) return;
ev.preventDefault();
const root = ev.target.closest('[data-workflows-org]'), org = root?.dataset.workflowsOrg, s = states.get(org);
if (!s?.editing) return;
capture(root, s);
const e = s.editing;
const draft = { ...e.draft, steps: e.draft.steps.map(st => ({ ...st, roles: rolesIn(st.roles) })) };
const why = refusal(s, { isNew: e.isNew, scope: e.scope, name: e.name, steps: draft.steps });
if (why) { s.status = why; redraw(org); return; }
const workflow = shape(draft);
const button = ev.target.querySelector('button[type="submit"]');
button.disabled = true;
try {
await saveFlow(org, s, { scope: e.scope, name: e.name, revision: e.revision ?? s.data.revision, workflow });
s.editing = null;
await reload(org, s, `Saved ${e.name}.`);
} catch (error) { s.status = error.message; }
redraw(org);
});
// ---------- SP9 (#1873): the read-only view ----------
// #/orgs/<id>/workflows lists the organization's workflows; #/orgs/<id>/workflows/<name>[?project=<p>]
// draws one as an inline-SVG graph. The data is the same read as the editor above: each step's title,
@@ -373,6 +253,24 @@
const same = (a, b) => JSON.stringify(a) === JSON.stringify(b);
const changed = d => d.isNew || !same(d.flow, d.base);
const editDirty = e => !!e && !same({ title: e.title, state: e.state, roles: e.roles }, e.orig);
const pending = d => !!d && (changed(d) || editDirty(d.edit));
// The steps as the graph draws them: the pending workflow with the open step's edit as typed.
const preview = d => {
const e = d?.edit;
if (!d) return null;
if (e?.mode !== 'edit' || !d.flow.steps[e.i] || !editDirty(e)) return d.flow.steps;
return d.flow.steps.map((st, j) => (j === e.i ? { title: e.title.trim() || st.title, state: e.state, roles: [...e.roles] } : st));
};
// The names of this organization's workflows with a change held on the page.
const heldKeys = org => [...drafts].filter(([k, d]) => JSON.parse(k)[0] === org && pending(d)).map(([k]) => JSON.parse(k).slice(1));
const held = org => heldKeys(org).map(([, name]) => name);
// The organization card's word for a held change (a bus stop or restart keeps it): each held workflow
// links back to its page, where the change is as typed.
const heldCardNote = org => {
const keys = heldKeys(org);
if (!keys.length) return '';
return `<p class="ws-panel tight note" data-wfg-held>Unsaved change kept on this page: ${keys.map(([scope, name]) => `<a href="${esc(flowHref(org, scope, name))}" data-wfg-held-link data-focus-key="${esc(`wfg-held:${scope}:${name}`)}">${esc(name)}${scope ? ` (project ${esc(scope)})` : ''}</a>`).join(', ')}.</p>`;
};
const READ_ONLY = 'Only the owner, on a Console started with send, can change workflows.';
// The graph's own words for a refusal where the form's would mislead: the change is kept, not lost.
const kept = {
@@ -391,11 +289,12 @@
const now = fresh ? norm(fresh) : null;
if (d.isNew) { d.stale = !!fresh; if (!fresh) d.revision = s.data.revision; }
else if (now && same(now, d.base)) { d.revision = s.data.revision; d.stale = false; }
else if (now && !changed(d)) {
else if (now && !changed(d) && !(d.edit?.mode === 'edit' && editDirty(d.edit) && !same(now.steps[d.edit.i], d.base.steps[d.edit.i]))) {
// Only other parts changed: take them. A typed step whose step changed elsewhere is stale below instead.
Object.assign(d, { base: now, flow: structuredClone(now), revision: s.data.revision, stale: false });
if (d.edit?.mode === 'edit' && d.edit.i >= now.steps.length) d.edit = null;
} else d.stale = true;
if (!changed(d) && !d.edit && !d.confirm && !d.status) { drafts.delete(key); return null; }
if (!changed(d) && (!d.edit || (d.edit.mode === 'edit' && !editDirty(d.edit))) && !d.confirm && !d.status) { drafts.delete(key); return null; }
return d;
}
function draftFor(org, s, scope, name) {
@@ -410,58 +309,94 @@
}
// The role picker: human, the organization's roles, the role templates, and first any role the step names
// that resolves to none of those (checked and marked, so leaving it in is a choice the save check names).
function rolePick(s, chosen, prefix) {
function rolePick(s, chosen, prefix, off = false) {
const defs = [...(s.data.roles.definitions || [])].sort(), tpl = [...(s.data.roles.templates || [])].filter(r => !defs.includes(r)).sort();
const odd = chosen.filter(r => !s.known.has(r));
const box = (r, mark = '') => `<label class="wfg-pick"><input type="checkbox" name="role" value="${esc(r)}"${chosen.includes(r) ? ' checked' : ''} data-focus-key="${esc(`${prefix}:role:${r}`)}"> <code>${esc(r)}</code>${mark}</label>`;
const group = (title, list, mark) => (list.length ? `<p class="wfg-pick-h">${title}</p>${list.map(r => box(r, mark)).join('')}` : '');
return `<fieldset class="wfg-roles-pick" data-wfg-roles-pick><legend>Roles, one to eight</legend>
return `<fieldset class="wfg-roles-pick" data-wfg-roles-pick${off ? ' disabled' : ''}><legend>Roles, one to eight</legend>
${group('Named in this step', odd, ` <span class="wf-missing" data-wfg-pick-missing>${MISSING}</span>`)}${box('human', ' <span class="muted">a person</span>')}
${group('This organization\'s roles', defs.filter(r => r !== 'human'), '')}${group('Role templates', tpl.filter(r => r !== 'human'), '')}</fieldset>`;
}
const stateSelect = (value, key) => `<label>State<select name="state" data-focus-key="${esc(key)}">${STATES.map(([v, l]) => `<option value="${v}"${value === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label>`;
function stepForm(org, s, scope, name, d) {
const stateSelect = (value, key, off = false) => `<label>State<select name="state" data-focus-key="${esc(key)}"${off ? ' disabled' : ''}>${STATES.map(([v, l]) => `<option value="${v}"${value === v ? ' selected' : ''}>${esc(l)}</option>`).join('')}</select></label>`;
// A new step's form: Add step puts it in the graph on this page, unsaved.
function addForm(org, s, scope, name, d) {
const e = d.edit, n = e.i + 1;
return `<form class="wfg-form" data-wfg-form data-live-key="${esc(`wfg-form:${org}:${scope}:${name}:${e.mode}:${e.i}`)}" data-live-hold novalidate>
<h2 data-wfg-form-title>${e.mode === 'add' ? `New step ${n}` : `Edit step ${n}`}</h2>
return `<form class="wfg-form" data-wfg-form data-wfg-add-form data-live-key="${esc(`wfg-form:${org}:${scope}:${name}:add:${e.i}`)}" data-live-hold novalidate>
<h2 data-wfg-form-title>New step ${n}</h2>
<label>Title<input name="title" maxlength="120" value="${esc(e.title)}" autocomplete="off" data-focus-key="wfg-f-title"></label>
${stateSelect(e.state, 'wfg-f-state')}${rolePick(s, e.roles, 'wfg-f')}
<p class="wfg-why" data-wfg-why>${esc(e.why ?? '')}</p>
<p class="wfg-form-acts"><button type="submit" class="ws-btn primary" data-wfg-apply data-focus-key="wfg-f-apply">${e.mode === 'add' ? 'Add step' : 'Apply'}</button> <button type="button" class="ws-btn" data-wfg-cancel data-focus-key="wfg-f-cancel">Cancel</button></p>
<p class="note">Apply changes the graph on this page. Save writes it to the organization file.</p></form>`;
<p class="wfg-form-acts"><button type="submit" class="ws-btn primary" data-wfg-add-step data-focus-key="wfg-f-add">Add step</button> <button type="button" class="ws-btn" data-wfg-cancel data-focus-key="wfg-f-cancel">Cancel</button></p>
<p class="note">Add step puts it in the graph on this page. Save writes the workflow to the organization file.</p></form>`;
}
function bar(org, s, scope, name, d) {
// SP17: the Save inside a panel form. It saves the whole workflow, the open step's edit with it.
// The line that says what Save did or why it did not: next to Save, wherever Save is. A refused delete
// (d.atBar) is said in the bar, next to Delete workflow.
const statusOf = (org, scope, name, d) => d?.status || notes.get(dkey(org, scope, name)) || '';
const formStatus = (org, scope, name, d) => (d?.atBar ? '' : statusOf(org, scope, name, d));
const statusLine = text => (text ? `<p class="wfg-status" data-wfg-status>${esc(text)}</p>` : '');
const saveButton = d => {
const busy = !!d?.busy, on = pending(d) && !busy;
return `<button type="button" class="ws-btn primary" data-wfg-save data-focus-key="wfg-save"${on ? '' : ' disabled'}>${busy ? 'Saving…' : 'Save'}</button>`;
};
// SP17: a selected step's panel is its edit form. It shows the step as the page holds it, or the edit typed
// into it, and holds its node across a repaint only once it differs from the step (data-live-hold).
function editForm(org, s, scope, name, steps, sel, d) {
const i = sel - 1, st = steps[i], e = d?.edit?.mode === 'edit' && d.edit.i === i ? d.edit : null;
const v = e ?? { title: st.title, state: st.state, roles: rolesOf(st), why: '' }, dirty = editDirty(e), off = !!d?.busy;
return `<form class="wfg-form wfg-stepform" data-wfg-form data-wfg-step-form="${i}" data-live-key="${esc(`wfg-form:${org}:${scope}:${name}:edit:${i}`)}"${dirty ? ' data-live-hold' : ''} novalidate aria-label="${esc(`Step ${sel}`)}">
<label>Title<input name="title" maxlength="120" value="${esc(v.title)}" autocomplete="off" data-focus-key="wfg-f-title"${off ? ' disabled' : ''}></label>
${stateSelect(v.state, 'wfg-f-state', off)}${rolePick(s, v.roles, 'wfg-f', off)}
<p class="wfg-why" data-wfg-why>${esc(v.why ?? '')}</p>
<p class="wfg-form-acts">${saveButton(d)} <button type="button" class="ws-btn" data-wfg-cancel data-focus-key="wfg-f-cancel"${dirty ? '' : ' hidden'}>Reset step</button></p>${statusLine(formStatus(org, scope, name, d))}</form>`;
}
// SP17: with no step selected, the panel edits the workflow's title and description, which the old
// organization-page form did. Each change goes into the pending workflow at once.
function metaForm(org, s, scope, name, d, w) {
return `<form class="wfg-form wfg-metaform" data-wfg-form data-wfg-meta-form data-live-key="${esc(`wfg-meta:${org}:${scope}:${name}`)}"${pending(d) ? ' data-live-hold' : ''} novalidate aria-label="Workflow">
<label>Title<input name="title" maxlength="120" value="${esc(w.title)}" autocomplete="off" data-focus-key="wfg-m-title"${d?.busy ? ' disabled' : ''}></label>
<label>Description<textarea name="description" maxlength="1000" rows="2" data-focus-key="wfg-m-desc"${d?.busy ? ' disabled' : ''}>${esc(w.description)}</textarea></label>
<p class="wfg-form-acts">${saveButton(d)}</p>${statusLine(formStatus(org, scope, name, d))}</form>`;
}
// `inPanel`: the panel shows a form with its own Save, so the bar does not repeat it.
function bar(org, s, scope, name, d, inPanel) {
if (!s.data.writable) return `<p class="note wfg-ro" data-wfg-readonly>${READ_ONLY}</p>`;
const dirty = !!d && changed(d), busy = d?.busy ? ' disabled' : '';
const status = d?.status || notes.get(dkey(org, scope, name)) || '';
const dirty = pending(d), busy = d?.busy ? ' disabled' : '';
// With a panel form, the status sits with that form's Save instead.
const status = inPanel ? (d?.atBar ? d.status : '') : statusOf(org, scope, name, d);
const stale = d?.stale ? `<p class="wfg-stale" data-wfg-stale>${d.isNew ? `A workflow named ${esc(name)} now exists here. Save will be refused. Discard to drop this one.` : 'The organization file changed this workflow since the page read it. Save will be refused. Discard to load the current version.'}</p>` : '';
const acts = d?.confirm
? `<span class="wfg-confirm" data-wfg-confirm>Delete ${esc(name)} from the organization file? <button type="button" class="ws-btn danger" data-wfg-delete-yes data-focus-key="wfg-delete-yes"${busy}>Delete workflow</button> <button type="button" class="ws-btn" data-wfg-delete-no data-focus-key="wfg-delete-no"${busy}>Keep</button></span>`
: `${dirty ? `<button type="button" class="ws-btn" data-wfg-discard data-focus-key="wfg-discard"${busy}>Discard</button> <button type="button" class="ws-btn primary" data-wfg-save data-focus-key="wfg-save"${busy}>${d.busy ? 'Saving…' : 'Save'}</button>` : ''}${d?.isNew ? '' : ` <button type="button" class="ws-btn danger" data-wfg-delete data-focus-key="wfg-delete"${busy}>Delete workflow</button>`}`;
: `${dirty ? `<button type="button" class="ws-btn" data-wfg-discard data-focus-key="wfg-discard"${busy}>Discard</button>${inPanel ? '' : ` <button type="button" class="ws-btn primary" data-wfg-save data-focus-key="wfg-save"${busy}>${d.busy ? 'Saving…' : 'Save'}</button>`}` : ''}${d?.isNew ? '' : ` <button type="button" class="ws-btn danger" data-wfg-delete data-focus-key="wfg-delete"${busy}>Delete workflow</button>`}`;
return `<div class="wfg-bar${dirty ? ' is-dirty' : ''}" data-wfg-bar>${dirty ? `<span class="wfg-badge" data-wfg-unsaved>Unsaved${d.isNew ? ', not in the file yet' : ''}</span>` : ''}<span class="wfg-acts">${acts}</span>
${status ? `<p class="wfg-status" data-wfg-status>${esc(status)}</p>` : ''}${stale}</div>`;
${statusLine(status)}${stale}</div>`;
}
const stepRef = (org, scope, name, steps, n) => `<a href="${esc(flowHref(org, scope, name, n))}" data-wfg-go="${n}">Step ${n}, ${esc(steps[n - 1].title)}</a>`;
function actions(steps, sel, d) {
const busy = d?.busy ? ' disabled' : '';
if (!sel) return `<p class="wfg-step-acts" data-wfg-actions><button type="button" class="ws-btn" data-wfg-add data-focus-key="wfg-add"${busy}>Add a step at the end</button></p>`;
const dis = c => (c || d?.busy ? ' disabled' : '');
return `<p class="wfg-step-acts" data-wfg-actions><button type="button" class="ws-btn" data-wfg-edit data-focus-key="wfg-edit"${busy}>Edit step</button>
<button type="button" class="ws-btn" data-wfg-add data-focus-key="wfg-add"${dis(steps.length >= 20)}>Add a step after</button>
return `<p class="wfg-step-acts" data-wfg-actions><button type="button" class="ws-btn" data-wfg-add data-focus-key="wfg-add"${dis(steps.length >= 20)}>Add a step after</button>
<button type="button" class="ws-btn" data-wfg-up data-focus-key="wfg-up"${dis(sel === 1)}>Move earlier</button>
<button type="button" class="ws-btn" data-wfg-down data-focus-key="wfg-down"${dis(sel === steps.length)}>Move later</button>
<button type="button" class="ws-btn danger" data-wfg-remove data-focus-key="wfg-remove"${dis(steps.length === 1)}>Remove step</button></p>`;
}
function detail(org, s, scope, name, steps, sel, d) {
function detail(org, s, scope, name, steps, sel, d, w) {
const writable = !!s.data.writable;
if (writable && d?.edit) return `<section class="panel wfg-detail" data-wfg-detail>${stepForm(org, s, scope, name, d)}</section>`;
if (!sel) return `<section class="panel wfg-detail" data-wfg-detail><h2>Step details</h2><p class="note">Select a step to see its roles, the state it puts a task in and the step it hands on to.</p>${writable ? actions(steps, 0, d) : ''}</section>`;
if (writable && d?.edit?.mode === 'add') return `<section class="panel wfg-detail" data-wfg-detail>${addForm(org, s, scope, name, d)}</section>`;
if (!sel) {
return writable
? `<section class="panel wfg-detail" data-wfg-detail><h2>This workflow</h2>${metaForm(org, s, scope, name, d, w)}<p class="note">Select a step in the graph to change it.</p>${actions(steps, 0, d)}</section>`
: `<section class="panel wfg-detail" data-wfg-detail><h2>Step details</h2><p class="note">Select a step to see its roles, the state it puts a task in and the step it hands on to.</p></section>`;
}
const st = steps[sel - 1], roles = rolesOf(st);
const roleList = roles.map(r => r === 'human' ? '<code>human</code> (a person)' : s.known.has(r) ? `<code>${esc(r)}</code>` : `<code>${esc(r)}</code> <span class="wf-missing" data-wfg-missing>${MISSING}</span>`).join(', ');
return `<section class="panel wfg-detail" data-wfg-detail><h2 data-wfg-detail-title>${esc(st.title)}</h2><dl class="wfg-dl">
<dt>Position</dt><dd data-wfg-field="position">Step ${sel} of ${steps.length}</dd>
const fields = writable ? '' : `
<dt>Roles</dt><dd data-wfg-field="roles">${roleList || '<span class="muted">None recorded</span>'}</dd>
<dt>Puts the task in</dt><dd data-wfg-field="state">${esc(stateLabel(st))}</dd>
<dt>Puts the task in</dt><dd data-wfg-field="state">${esc(stateLabel(st))}</dd>`;
return `<section class="panel wfg-detail" data-wfg-detail><h2 data-wfg-detail-title>${esc(st.title)}</h2>${writable ? editForm(org, s, scope, name, steps, sel, d) : ''}<dl class="wfg-dl">
<dt>Position</dt><dd data-wfg-field="position">Step ${sel} of ${steps.length}</dd>${fields}
<dt>Comes after</dt><dd data-wfg-field="after">${sel > 1 ? stepRef(org, scope, name, steps, sel - 1) : 'Nothing: this is the first step'}</dd>
<dt>Hands on to</dt><dd data-wfg-field="next">${sel < steps.length ? stepRef(org, scope, name, steps, sel + 1) : 'Nothing: this is the last step'}</dd>
</dl>${writable ? actions(steps, sel, d) : ''}<p class="note">The workflow file records no gate or inputs for a step, and no read says which step a task is on now.</p></section>`;
@@ -475,9 +410,10 @@
if (!fresh && !d) return { title: esc(name), sub: '', body: `${note ? `<p class="wfg-status" data-wfg-status>${esc(note)}</p>` : ''}<p class="note" data-wfg-unknown>No workflow named ${esc(name)} in ${scope ? `project ${esc(scope)}` : 'the organization'}.</p>` };
const w = d ? d.flow : norm(fresh), steps = w.steps;
const raw = Number(q.get('step')), sel = Number.isInteger(raw) && raw >= 1 && raw <= steps.length ? raw : 0;
if (d && !d.busy) park(d, sel - 1);
const sub = `${esc(scopeLabel(scope))}, <code>${esc(name)}</code>, ${count(steps.length)}.${w.description ? ` ${esc(w.description)}` : ''}`;
const body = steps.length
? `${bar(org, s, scope, name, d)}<div class="wfg-frame" data-wfg-frame>${graph(org, s, scope, name, steps, sel)}</div>${detail(org, s, scope, name, steps, sel, d)}`
? `${bar(org, s, scope, name, d, !!s.data.writable && d?.edit?.mode !== 'add')}<div class="wfg-frame" data-wfg-frame>${graph(org, s, scope, name, d ? preview(d) : steps, sel)}</div>${detail(org, s, scope, name, steps, sel, d, w)}`
: `${bar(org, s, scope, name, d)}<p class="note">This workflow has no steps.</p>`;
return { title: esc(w.title || name), sub, body };
}
@@ -524,15 +460,17 @@
const attr = name === null ? 'data-wfg-list' : 'data-wfg-page';
const wrapIt = (title, sub, body) => `<article class="ws wfg" ${attr} data-wfg-org="${esc(org)}"${name === null ? '' : ` data-wfg-name="${esc(name)}"`}>${head(title, sub)}${info.unread}${body}</article>`;
// Review P3: a change held for this organization that the page cannot draw now is said to be kept.
const held = [...drafts].filter(([k, d]) => JSON.parse(k)[0] === org && (changed(d) || editDirty(d.edit))).map(([k]) => JSON.parse(k)[2]);
const keptNote = held.length ? `<p class="note" data-wfg-held>Unsaved change to ${held.map(n => esc(n)).join(', ')} is kept on this page. It comes back when the workflows can be read.</p>` : '';
const names = held(org), s = states.get(org);
const keptNote = !names.length ? '' : s?.readError && s.data
? `<p class="note" data-wfg-error>The last workflows read failed: ${esc(s.readError.replace(/\.$/, ''))}. The page shows the read before it.</p><p class="note" data-wfg-held>Unsaved change to ${names.map(n => esc(n)).join(', ')} is kept on this page.</p>`
: `<p class="note" data-wfg-held>Unsaved change to ${names.map(n => esc(n)).join(', ')} is kept on this page. It comes back when the workflows can be read.</p>`;
// E2E6 P2-8: a stopped bus is not read; the note above says why.
if (info.stopped) return wrapIt(name === null ? 'Workflows' : esc(name), `Workflows in ${esc(info.label)}.`, keptNote);
const s = states.get(org);
if (!s?.data) return wrapIt(name === null ? 'Workflows' : esc(name), `Workflows in ${esc(info.label)}.`, `<p class="note" data-wfg-error>${esc(s?.error ?? 'Workflows could not be read.')}</p>${keptNote}`);
if (name === null) return wrapIt('Workflows', `The steps a task goes through in ${esc(info.label)}, in order, with the roles that do each.${s.data.writable ? ' Open one to change it.' : ''}`, listBody(org, s, info.label));
const lastRead = s.readError ? keptNote : '';
if (name === null) return wrapIt('Workflows', `The steps a task goes through in ${esc(info.label)}, in order, with the roles that do each.${s.data.writable ? ' Open one to change it.' : ''}`, lastRead + listBody(org, s, info.label));
const g = graphBody(org, s, name, q);
return wrapIt(g.title, g.sub, g.body);
return wrapIt(g.title, g.sub, lastRead + g.body);
}
async function page(org, name, q) {
const info = await orgOf(org);
@@ -582,8 +520,39 @@
say(text);
}
// SP17: the selected step's form, its edit (made at the first change) and its message line.
const stepFormEl = () => document.querySelector('#bus-view [data-wfg-page] [data-wfg-step-form]');
// The open step edit carried into the pending workflow: '' when there was nothing to carry or it went in,
// or the reason it cannot (the edit is kept and the form says why).
function carry(d) {
const e = d?.edit;
if (!e || e.mode !== 'edit') return '';
if (!editDirty(e)) { d.edit = null; return ''; }
const st = { title: e.title.trim(), state: e.state, roles: [...e.roles] };
const refused = stepRefusal(st, e.i + 1);
if (refused) { const form = stepFormEl(); if (form) why(form, e, refused); else { e.why = refused; say(refused); } return refused; }
d.flow.steps[e.i] = st; d.edit = null;
return '';
}
// SP17 review: an open edit of a step other than the one shown (a card step link, the address or Back opened
// another step) goes into the pending workflow as typed, never dropped. A step the save check refuses is then
// named by Save, which checks every step.
function park(d, i) {
const e = d?.edit;
if (!e || e.mode !== 'edit' || e.i === i) return;
if (editDirty(e) && d.flow.steps[e.i]) d.flow.steps[e.i] = { title: e.title.trim(), state: e.state, roles: [...e.roles] };
d.edit = null;
}
// SP17 review: while a Save or delete is in flight the form's fields take no typing, so nothing typed then is
// dropped when the answer redraws the form. Drawn off when busy; a held form (data-live-hold) is set here.
const lockForms = off => document.querySelectorAll('#bus-view [data-wfg-page] :is([data-wfg-step-form],[data-wfg-meta-form])').forEach(f =>
f.querySelectorAll('input[name="title"],textarea,select,[data-wfg-roles-pick]').forEach(c => { c.disabled = off; }));
const toAddTitle = () => document.querySelector('#bus-view [data-wfg-page] [data-wfg-add-form] input[name="title"]')?.focus();
// Put focus back in the step form's title after a refusal (the form may be a held node).
const toTitle = () => { const f = stepFormEl()?.elements.title; if (f) { f.focus(); f.setSelectionRange(f.value.length, f.value.length); } };
document.addEventListener('click', async ev => {
const btn = ev.target.closest('[data-wfg-new],[data-wfg-new-cancel],[data-wfg-edit],[data-wfg-add],[data-wfg-up],[data-wfg-down],[data-wfg-remove],[data-wfg-cancel],[data-wfg-discard],[data-wfg-save],[data-wfg-delete],[data-wfg-delete-no],[data-wfg-delete-yes]');
const btn = ev.target.closest('[data-wfg-new],[data-wfg-new-cancel],[data-wfg-add],[data-wfg-up],[data-wfg-down],[data-wfg-remove],[data-wfg-cancel],[data-wfg-discard],[data-wfg-save],[data-wfg-delete],[data-wfg-delete-no],[data-wfg-delete-yes]');
if (!btn || btn.disabled) return;
if (btn.matches('[data-wfg-new],[data-wfg-new-cancel]')) {
const org = btn.closest('[data-wfg-list]')?.dataset.wfgOrg;
@@ -603,15 +572,20 @@
say(`Discarded the change to ${name}.`);
return paint('wfg-delete');
}
if (btn.hasAttribute('data-wfg-save')) return save(at, btn);
if (btn.hasAttribute('data-wfg-save')) return save(at);
if (btn.matches('[data-wfg-delete-yes]')) return remove(at);
const d = draftFor(org, s, scope, name) ?? drafts.get(key);
if (!d) return;
d.status = '';
d.status = ''; d.atBar = false;
const steps = d.flow.steps;
if (btn.hasAttribute('data-wfg-edit') && steps[sel - 1]) { openForm(d, 'edit', sel - 1, steps[sel - 1]); return paint('wfg-f-title'); }
if (btn.hasAttribute('data-wfg-cancel')) {
// The new step's Cancel goes back to the step it was opened from; the step form's Reset puts the step back.
if (d.edit?.mode === 'edit') { d.edit = null; say(`Step ${sel} is back as the page holds it.`); return paint('wfg-f-title'); }
d.edit = null; select(sel); return paint(sel ? 'wfg-f-title' : 'wfg-add');
}
// Moving, adding or removing a step takes the open step's edit with it first.
if (carry(d)) return toTitle();
if (btn.hasAttribute('data-wfg-add')) { openForm(d, 'add', sel ? sel : steps.length, null); return paint('wfg-f-title'); }
if (btn.hasAttribute('data-wfg-cancel')) { const back = d.edit?.mode === 'edit' ? d.edit.i + 1 : sel; d.edit = null; select(back); return paint(back ? `wfg-step:${back}` : 'wfg-add'); }
if (btn.matches('[data-wfg-up],[data-wfg-down]') && steps[sel - 1]) {
const to = btn.hasAttribute('data-wfg-up') ? sel - 1 : sel + 1;
if (to < 1 || to > steps.length) return;
@@ -631,56 +605,109 @@
if (btn.hasAttribute('data-wfg-delete')) { d.confirm = true; return paint('wfg-delete-no'); }
if (btn.hasAttribute('data-wfg-delete-no')) { d.confirm = false; return paint('wfg-delete'); }
});
// SP17: the page's read brought up to date from a write's answer: the workflow as sent (or gone) and the
// revision the write answered. Without a revision in the answer the page reads the file again.
async function written(org, s, scope, name, workflow, answer) {
const now = states.get(org) ?? s, flows = now.data ? flowsIn(now, scope) : null;
if (plain(flows) && typeof answer?.revision === 'string' && /^[0-9a-f]{64}$/.test(answer.revision)) {
if (workflow) flows[name] = workflow; else delete flows[name];
now.data.revision = answer.revision;
return;
}
try { await read(org, now); } catch { /* the next poll reads it */ }
}
async function save({ org, name, scope, s, key }) {
const d = drafts.get(key);
if (!d || d.busy) return;
// Review P2: the open step form's edits are not in the workflow yet; saving now would drop them unsaid.
const refused = (editDirty(d.edit) ? `Not saved: step ${d.edit.i + 1} has edits not applied. Apply or cancel the step first.` : '')
|| refusal(s, { isNew: d.isNew, scope, name, steps: d.flow.steps });
// SP17 review: a new step typed in the add form is not saved over or dropped: Save says so and keeps the
// form. An add form with nothing typed in it is closed and the rest is saved.
if (d.edit?.mode === 'add') {
if (d.edit.title.trim() || d.edit.roles.length) {
d.atBar = false; d.status = `Not saved: new step ${d.edit.i + 1} is not added yet. Press Add step, or Cancel to drop it.`;
say(d.status); paint(); return toAddTitle();
}
d.edit = null;
}
// SP17: the open step's edit goes in with the save; one the save check refuses stays in its form.
const unfit = carry(d);
d.atBar = false;
if (unfit) { d.status = `Not saved: ${unfit}`; say(d.status); paint(); return toTitle(); }
const refused = refusal(s, { isNew: d.isNew, scope, name, steps: d.flow.steps });
if (refused) { d.status = refused; say(refused); return paint('wfg-save'); }
d.busy = true; d.status = 'Saving…'; paint();
if (!changed(d)) return paint();
d.busy = true; d.status = 'Saving…'; paint(); lockForms(true);
try {
await saveFlow(org, s, { scope, name, revision: d.revision, workflow: shape(d.flow) });
const workflow = shape(d.flow);
await writing(org, async () => written(org, s, scope, name, workflow, await saveFlow(org, s, { scope, name, revision: d.revision, workflow })));
drafts.delete(key);
notes.set(key, `Saved ${name}.`);
try { await read(org, states.get(org) ?? s); } catch { /* the next poll reads it */ }
say(`Saved ${name}.`);
paint(selected() ? `wfg-step:${selected()}` : 'wfg-delete');
// Focus stays in the form it was saved from, so the line saying Saved stays in view (at 390 a jump to the
// graph node put it below the fold).
paint(selected() ? 'wfg-f-title' : 'wfg-m-title');
} catch (error) {
d.busy = false;
d.status = kept[error.code] ?? `Not saved: ${error.message} Your change is kept.`;
say(d.status);
paint('wfg-save');
paint('wfg-save'); lockForms(false);
}
}
async function remove({ org, name, scope, s, key }) {
const d = drafts.get(key);
if (!d || d.busy) return;
d.busy = true; paint();
d.busy = true; paint(); lockForms(true);
try {
// The revision of the workflow the page shows (settle moves it on only while this workflow is unchanged):
// a change made to it since is refused, not deleted over.
await removeFlow(org, s, { scope, name, revision: d.revision });
await writing(org, async () => written(org, s, scope, name, null, await removeFlow(org, s, { scope, name, revision: d.revision })));
drafts.delete(key);
notes.set(dkey(org, '', ''), `Deleted ${name}.`);
say(`Deleted ${name}.`);
try { await read(org, s); } catch { /* the next poll reads it */ }
location.hash = `${orgHash(org)}/workflows`;
} catch (error) {
d.busy = false; d.confirm = false;
d.busy = false; d.confirm = false; d.atBar = true;
// Recheck B: Discard shows only with a pending change; without one the next read draws the current version.
d.status = error.code === 'revision-conflict' ? `Not deleted: the organization file changed this workflow since the page read it. ${changed(d) ? 'Discard to load the current version.' : 'The page shows the current version at its next read.'}` : `Not deleted: ${error.message}`;
say(d.status);
paint('wfg-delete');
paint('wfg-delete'); lockForms(false);
}
}
// SP17: after a change in a panel form, the bar and the form's own buttons follow it without redrawing the
// form, so the caret stays where it is.
function follow(at, d, form) {
const old = document.querySelector('#bus-view [data-wfg-page] [data-wfg-bar]');
if (old) old.outerHTML = bar(at.org, at.s, at.scope, at.name, d, true);
const save = form.querySelector('[data-wfg-save]');
if (save) save.disabled = !pending(d) || !!d.busy;
form.querySelector('[data-wfg-cancel]')?.toggleAttribute('hidden', !editDirty(d.edit));
form.toggleAttribute('data-live-hold', form.matches('[data-wfg-step-form]') ? editDirty(d.edit) : pending(d));
// A status from before this change no longer applies.
const text = formStatus(at.org, at.scope, at.name, d), line = form.querySelector('[data-wfg-status]');
if (line && !text) line.remove(); else if (line) line.textContent = text;
// The graph draws the step as typed, so the box shows the change before Save.
const frame = document.querySelector('#bus-view [data-wfg-page] [data-wfg-frame]');
if (frame && form.matches('[data-wfg-step-form]')) frame.innerHTML = graph(at.org, at.s, at.scope, at.name, preview(d), Number(form.dataset.wfgStepForm) + 1);
}
// Every change in a form goes into the page's state at once, so any repaint draws what was entered.
document.addEventListener('input', ev => {
const form = ev.target.closest('[data-wfg-form]');
if (!form) return;
if (form.matches('[data-wfg-newform]')) { const f = newForms.get(shown.org); if (f) readForm(form, f); return; }
const at = here(form), d = at && drafts.get(at.key);
if (d?.edit) readForm(form, d.edit);
const at = here(form);
if (!at) return;
if (form.matches('[data-wfg-add-form]')) { const d = drafts.get(at.key); if (d?.edit) readForm(form, d.edit); return; }
const d = draftFor(at.org, at.s, at.scope, at.name) ?? drafts.get(at.key);
if (!d || d.busy) return;
d.status = ''; d.atBar = false;
if (form.matches('[data-wfg-meta-form]')) {
d.flow.title = form.elements.title.value;
d.flow.description = form.elements.description.value;
return follow(at, d, form);
}
const i = Number(form.dataset.wfgStepForm);
if (!(d.edit?.mode === 'edit' && d.edit.i === i)) { if (!d.flow.steps[i]) return; park(d, i); openForm(d, 'edit', i, d.flow.steps[i]); }
readForm(form, d.edit);
follow(at, d, form);
});
document.addEventListener('submit', ev => {
const form = ev.target.closest?.('[data-wfg-form]');
@@ -700,52 +727,87 @@
location.hash = flowHref(org, f.scope, f.name, 1);
return;
}
const at = here(form), d = at && drafts.get(at.key);
const at = here(form);
if (!at) return;
// Enter in the step or workflow form is its Save.
if (!form.matches('[data-wfg-add-form]')) { if (!form.querySelector('[data-wfg-save]')?.disabled) save(at); return; }
const d = drafts.get(at.key);
if (!d?.edit) return;
readForm(form, d.edit);
const e = d.edit, st = { title: e.title.trim(), state: e.state, roles: e.roles };
const refused = stepRefusal(st, e.i + 1);
if (refused) return why(form, e, refused);
if (e.mode === 'add') d.flow.steps.splice(e.i, 0, st); else d.flow.steps[e.i] = st;
d.flow.steps.splice(e.i, 0, st);
d.edit = null; d.status = '';
select(e.i + 1);
say(`${e.mode === 'add' ? 'Added' : 'Changed'} step ${e.i + 1}. Not saved yet.`);
say(`Added step ${e.i + 1}. Not saved yet.`);
paint('wfg-save');
});
// Escape in a step form is Cancel.
// Escape in a step form is its Cancel or Reset.
document.addEventListener('keydown', ev => {
if (ev.key !== 'Escape') return;
const form = ev.target.closest?.('[data-wfg-form]:not([data-wfg-newform])');
form?.querySelector('[data-wfg-cancel]')?.click();
const form = ev.target.closest?.('[data-wfg-add-form],[data-wfg-step-form]');
const b = form?.querySelector('[data-wfg-cancel]');
if (b && !b.hidden) b.click();
});
// The organization-switch and restart guards (display.js, console-restart.js) ask before these are lost.
function hasDraft() {
return [...drafts.values()].some(d => changed(d) || editDirty(d.edit))
return [...drafts.values()].some(pending)
|| [...newForms.values()].some(f => f.name || f.title.trim() || f.roles.length);
}
function forget() { drafts.clear(); newForms.clear(); }
// The organization page's card: each workflow as a link to its graph, from the page's one workflow read.
// The organization page's card: each workflow as a link to its graph, and under it each step as a link to
// that step's form (SP17), from the page's one workflow read.
function card(org, { stopped = false, label = org } = {}) {
const all = `<a href="${esc(`${orgHash(org)}/workflows`)}" data-wfg-all data-focus-key="wfg-all">All workflows</a>`;
const h = note => `<div class="ws-sec-h"><h2>Workflows</h2>${note ? `<span class="note">${note}</span>` : ''}${all}</div>`;
if (stopped) return `<div class="wfg-card" data-wfg-card data-bus-stopped>${h('')}<p class="ws-panel tight note">Not read: the bus is stopped.</p></div>`;
const heldNote = heldCardNote(org);
if (stopped) return `<div class="wfg-card" data-wfg-card data-bus-stopped>${h('')}<p class="ws-panel tight note">Not read: the bus is stopped.</p>${heldNote}</div>`;
const s = states.get(org);
if (!s?.data) return `<div class="wfg-card" data-wfg-card>${h('')}<p class="ws-panel tight note" data-wfg-error>${esc(s?.error ?? 'Workflows could not be read.')}</p></div>`;
if (!s?.data) return `<div class="wfg-card" data-wfg-card>${h('')}<p class="ws-panel tight note" data-wfg-error>${esc(s?.error ?? 'Workflows could not be read.')}</p>${heldNote}</div>`;
const rows = listed(s).flatMap(([scope, , list]) => list.map(([name, w]) => [scope, name, w]));
if (!rows.length) return `<div class="wfg-card" data-wfg-card>${h('none')}<div class="ws-panel tight">${none(org, s, label)}</div></div>`;
return `<div class="wfg-card" data-wfg-card>${h(String(rows.length))}<ul class="ws-panel tight wfg-cardlist">${rows.map(([scope, name, w]) => `<li><a href="${esc(flowHref(org, scope, name))}" data-wfg-card-item data-focus-key="${esc(`wfg-card:${scope}:${name}`)}"><strong>${esc(w?.title || name)}</strong> <span class="muted">${count(stepsOf(w).length)}${scope ? `, project ${esc(scope)}` : ''}</span></a></li>`).join('')}</ul></div>`;
if (!rows.length) return `<div class="wfg-card" data-wfg-card>${h('none')}<div class="ws-panel tight">${none(org, s, label)}</div>${heldNote}</div>`;
const stepLinks = (scope, name, w) => {
const steps = stepsOf(w);
if (!steps.length) return '';
return `<ol class="wfg-card-steps" aria-label="${esc(`Steps of ${w?.title || name}`)}">${steps.map((st, i) => `<li><a href="${esc(flowHref(org, scope, name, i + 1))}" data-wfg-card-step="${i + 1}" data-focus-key="${esc(`wfg-card:${scope}:${name}:${i + 1}`)}" aria-label="${esc(`Change step ${i + 1}, ${st.title ?? ''}`)}">${esc(st.title)}</a></li>`).join('')}</ol>`;
};
return `<div class="wfg-card" data-wfg-card>${h(String(rows.length))}<ul class="ws-panel tight wfg-cardlist">${rows.map(([scope, name, w]) => `<li><a href="${esc(flowHref(org, scope, name))}" data-wfg-card-item data-focus-key="${esc(`wfg-card:${scope}:${name}`)}"><strong>${esc(w?.title || name)}</strong> <span class="muted">${count(stepsOf(w).length)}${scope ? `, project ${esc(scope)}` : ''}</span></a>${stepLinks(scope, name, w)}</li>`).join('')}</ul>${heldNote}</div>`;
}
// SP17: a step link on the card lands in that step's title field, ready to type (bus.js asks landed() after
// the page it opens is drawn, in place of focusing the heading).
let landing = null;
function landed() {
const want = landing;
landing = null;
if (!want || location.hash !== want) return false;
const form = stepFormEl(), f = form?.elements.title;
if (!f) return false;
// The title and the Save under it both in view (at 390 Save was below the fold), the title winning on a short screen.
f.focus({ preventScroll: true });
form.querySelector('[data-wfg-save]')?.scrollIntoView({ block: 'nearest' });
f.scrollIntoView({ block: 'nearest' });
f.setSelectionRange(f.value.length, f.value.length);
say(`Step ${Number(form.dataset.wfgStepForm) + 1}, ${f.value}. Change it and press Save.`);
return true;
}
// A step box or a step link in the details selects that step in the address (setQuery repaints).
document.addEventListener('click', ev => {
if (ev.button !== 0 || ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
const cardStep = ev.target.closest('[data-wfg-card-step]');
if (cardStep) { landing = cardStep.getAttribute('href'); return; }
// A step box or a step link in the details selects that step in the address (setQuery repaints). The open
// step's edit goes into the pending workflow first; one the save check refuses keeps the step selected.
const link = ev.target.closest('[data-wfg-step],[data-wfg-go]');
if (link && WS()?.setQuery && ev.button === 0 && !ev.metaKey && !ev.ctrlKey && !ev.shiftKey && !ev.altKey) {
if (link && WS()?.setQuery) {
ev.preventDefault();
const at = here(link), d = at && drafts.get(at.key);
if (d && carry(d)) return toTitle();
WS().setQuery({ step: link.dataset.wfgStep ?? link.dataset.wfgGo });
return;
}
// Apply a pack: the pack picker on the organization page, scrolled into view.
const apply = ev.target.closest('[data-wfg-apply]');
if (!apply || ev.button !== 0 || ev.metaKey || ev.ctrlKey || ev.shiftKey || ev.altKey) return;
const apply = ev.target.closest('a[data-wfg-apply]');
if (!apply) return;
const show = () => { const p = document.querySelector('[data-packs]'); if (!p) return false; p.scrollIntoView({ block: 'start' }); return true; };
if (location.hash === apply.getAttribute('href') && show()) { ev.preventDefault(); return; }
const until = Date.now() + 8000;
@@ -756,5 +818,7 @@
window.matchMedia(NARROW).addEventListener('change', () => {
if (document.querySelector('[data-wfg-graph]')) document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));
});
window.MosaicWorkflows = { load, section, page, card, hasDraft, forget };
// section(): the organization page's old form editor is gone (SP17); workspace.js still asks for it.
const section = () => '';
window.MosaicWorkflows = { load, section, page, card, hasDraft, forget, landed };
})();
+146 -31
View File
@@ -367,12 +367,12 @@
${orgTiles}
${docrow}
<div class="ws-split">
<section aria-label="Measures and sessions">
<section aria-label="Sessions and workflows">
${secH('Active agent sessions', live ? (noRuns ? 'running not read' : live.length ? `${live.length} running${tileAgents ? `, ${liveWorking} working` : ', working not read'}` : 'none running') : '', `<a href="#/agents?${oq}" data-focus-key="agents-all">This organization's agents</a>`)}
${sessions}
</section>
<section aria-label="Workflows and settings">
${window.MosaicWorkflows?.card?.(id, { stopped, label: label(org) }) ?? ''}
</section>
<section aria-label="Settings">
${secH('Settings', 'every setting, with where its value comes from')}
${settingsList(org, { business, settings, instances, noRuns, orgCount: list ? list.length : null })}
</section>
@@ -638,7 +638,7 @@
const bar = (o, parts, style = '') => `<div class="ws-bar"${style ? ` style="${style}"` : ''} aria-hidden="true">${parts.filter(p => p.n > 0).map(p => `<i class="ws-o" style="${o.style(p.id)};flex:${p.n}"></i>`).join('')}</div>`;
const by = (o, parts, fmt = n => n) => `<div class="ws-by">${parts.map(p => `<span>${av(o.meta(p.id))}<span class="ws-sr">${esc(o.name(p.id))}</span>${esc(fmt(p.n))}</span>`).join('')}</div>`;
// Why an organization's instances read gave nothing, in a word or two.
const READ_ERR = { 403: 'refused', 0: 'signed out' };
const READ_ERR = { 401: 'signed out', 403: 'refused', 0: 'signed out' };
const instWhy = r => READ_ERR[r.err?.status] || r.err?.code || 'no answer';
// SP8 (#1873): one KPI tile, a link to the page that lists what it counts. A tile with no figure
// (`big` null) is drawn quiet with `none` in its place; `miss` names the organizations the figure
@@ -1141,17 +1141,91 @@
}
// SP13 (#1873): the drawer's instances read gives the agent's state. The drawer does not hold the
// page for it: once the page's own reads have answered (`opts.page`), a drawer whose instances read
// has not says its state is being read, and repaints when the read answers. That answer is kept for
// the one repaint it asks for; a repaint while the read is still open waits on the same read.
// has not says its state is being read, and repaints when the read answers. A repaint while the read
// is still open waits on the same read; once it answers it is let go, so the next render reads again.
let drawerInst = null, drawerReads = 0; // { org, n, done, value, p }
// Repaints whose read answered before their drawer was on screen, keyed by the drawer's
// data-drawer-pending and its agent id. A drawer never painted (closed, or replaced by a later paint)
// leaves its entry; the oldest go first.
const drawerLate = new Map(), DRAWER_LATE_MAX = 8;
const drawerInstRead = org => {
if (drawerInst?.org === org) return drawerInst;
const r = { org, n: ++drawerReads, done: false, value: null };
r.p = data.instances(org).then(v => ({ inst: instancesOf(v), copies: copiesOf(v) }), err => ({ inst: null, copies: {}, err }))
.then(v => { r.done = true; r.value = v; return v; });
r.p.then(() => { if (drawerInst === r) drawerInst = null; });
drawerInst = r;
return r;
};
// SP16 (#1873): the template a pack hire was hired from. Only the packs read names it (owner only):
// the pack's hire of this name points at a definition, and that definition at a template. It is read
// only for an organization agent the instances read says a pack hired. The answer is kept per
// organization for DRAWER_PACKS_KEEP ms, and a repaint draws from the kept answer, also while a newer
// read is open, so the line does not change on every poll and a poll does not read packs each time.
// A kept answer that is of no use for this hire is read again at once (SP16 review 3): a refusal or no
// answer on each render, so the line recovers with the route; an answer that does not name this hire
// (a hire made after it was read) once per hire until the keep runs out, so a hire the pack really
// does not name does not read packs on every poll. `p` is given only when the drawer should repaint
// on it: nothing is kept, or the kept answer is of no use for this hire. `value` is then the kept
// refusal, or nothing (the line says being read) rather than a kept answer that does not name it.
// `start` false only looks: the drawer's second look after its race starts no read.
// The pack is the one installed now; the read does not say which version the hire was made from.
// It never rejects: a refusal, no answer or an answer that is not the packs list each give `err`.
const drawerPacksKept = new Map(), DRAWER_PACKS_KEEP = 60000; // org -> { at, value, p, asked }
const drawerPacks = (org, instValue, key, start = true) => {
const item = instValue?.inst?.[key];
if (!item || !isHired(item) || typeof item.pack?.id !== 'string') return null;
let k = drawerPacksKept.get(org);
if (!k) drawerPacksKept.set(org, (k = { at: 0, value: null, p: null, asked: new Set() }));
const v = k.value, named = !!v && !v.err && !!packTemplate(item, key, v).template;
const expired = !v || Date.now() - k.at >= DRAWER_PACKS_KEEP;
const again = !!v && (!!v.err || (!named && !k.asked.has(key)));
if (start && !k.p && (expired || again)) {
if (expired) k.asked.clear();
if (v && !v.err && !named) k.asked.add(key);
const kept = k;
kept.p = fetch(`/api/orgs/${enc(org)}/packs`, { cache: 'no-store', redirect: 'manual' }).then(async r => {
if (!r.ok || r.type === 'opaqueredirect') return { err: { status: r.type === 'opaqueredirect' ? 0 : r.status } };
const v = await r.json().catch(() => null);
return Array.isArray(v?.packs) ? { packs: v.packs } : { err: { code: 'no answer' } };
}).catch(() => ({ err: { code: 'no answer' } })).then(v => { kept.value = v; kept.at = Date.now(); kept.p = null; return v; });
}
const wait = k.p && !named ? k.p : null;
return { value: wait && v && !v.err ? null : v, p: wait };
};
// The pack's own label and the template its hire of this name is made from, from the packs read. The
// instance names only the pack's id; the installed pack's document carries its label.
const packTemplate = (item, name, read) => {
const pk = item?.pack, doc = arr(read?.packs).find(p => p?.id === pk?.id && (pk?.origin == null || p?.origin === pk.origin))?.pack;
const hire = arr(doc?.hires).find(h => h?.name === name);
const entry = typeof hire?.definition === 'string' && doc?.definitions && typeof doc.definitions === 'object' ? doc.definitions[hire.definition] : null;
const t = entry?.template ?? entry?.from?.template;
return { template: typeof t === 'string' && t ? t : '', label: typeof doc?.label === 'string' && doc.label ? doc.label : '' };
};
// Swaps a drawer still on screen for `html`, keeping focus, and runs at once a repaint already waiting
// on the fresh drawer's marker (its packs read answered before this drawer was painted).
const drawerSwap = (node, html) => {
const key = focusKey(node), tpl = document.createElement('template');
tpl.innerHTML = html;
const fresh = tpl.content.firstElementChild;
if (!fresh) return;
node.replaceWith(fresh);
refocus(fresh, key);
drawerLateRun(fresh);
};
function drawerLateRun(node) {
const k = `${node.dataset.drawerPending}:${node.dataset.wsDrawer}`, redo = node.dataset.drawerPending ? drawerLate.get(k) : null;
if (redo) { drawerLate.delete(k); redo(node); }
}
// Repaints the drawer that carries `mark` once `p` answers: now if it is on screen, else once it is
// painted. `build(answer)` runs when the read answers and gives what draws the drawer at the swap.
const drawerWhen = (p, mark, id, build) => p.then(v => {
const draw = build(v), redo = node => drawerSwap(node, draw());
const node = document.querySelector(`#bus-view [data-ws-drawer="${CSS.escape(id)}"][data-drawer-pending="${mark}"]`);
if (node) { redo(node); return; }
drawerLate.set(`${mark}:${id}`, redo);
while (drawerLate.size > DRAWER_LATE_MAX) drawerLate.delete(drawerLate.keys().next().value);
});
async function agentDrawer(q, opts = {}) {
const pick = agentPick(q);
if (!pick || (opts.only && pick.org !== opts.only)) return '';
@@ -1163,46 +1237,71 @@
typeof opts.configIn === 'function' ? Promise.resolve(opts.configIn(org)).catch(() => null) : null,
ensureThemes(),
]);
await Promise.race([ir.p, opts.page ?? ir.p]);
const pending = !ir.done;
// SP14 (#1873): when the read answers, only the drawer repaints, from the reads it already has; the
// page's own reads are not made again. Each open repaints its own drawer if it is still on screen and
// still waits on this read (data-drawer-pending names the read), so a second agent opened while the
// read was open repaints too. A closed drawer repaints nothing, and the answer is not kept for a later open.
if (pending) ir.p.then(() => {
if (drawerInst === ir) drawerInst = null;
const node = document.querySelector(`#bus-view [data-ws-drawer="${CSS.escape(id)}"][data-drawer-pending="${ir.n}"]`);
if (!node) return;
const key = focusKey(node), tpl = document.createElement('template');
tpl.innerHTML = drawerHtml(pick, { body, business, config, pending: false, instRead: ir.value });
const fresh = tpl.content.firstElementChild;
if (!fresh) return;
node.replaceWith(fresh);
refocus(fresh, key);
});
else if (drawerInst === ir) drawerInst = null;
return drawerHtml(pick, { body, business, config, pending: pending && ir.n, instRead: pending ? null : ir.value });
const page = opts.page ?? null;
const html = (instRead, packs, pending) => drawerHtml(pick, { body, business, config, pending, instRead, packs });
// Each read the drawer waits on is raced against the page's reads (SP16 review), so neither the
// instances read nor a pack hire's packs read holds the page's paint.
await Promise.race([ir.p, page ?? ir.p]);
// SP14 (#1873): when a read answers, only the drawer repaints, from the reads it already has; the
// page's own reads are not made again. data-drawer-pending names the read it waits on: `<n>` for the
// instances read, `<n>p` for the packs read after it, so each repaint finds only its own drawer. A
// closed drawer repaints nothing. SP16: a read can answer after this HTML is returned and before the
// page that carries it is on screen; then the repaint waits in drawerLate, and afterPaint runs it.
// When the instances read answers, the state is drawn at once, and the template line, if its packs
// read is still open with nothing of use kept, says it is being read (or the kept refusal) and
// repaints when that read answers.
const packsStage = instRead => {
const pk = drawerPacks(org, instRead, pick.key);
if (pk?.p) drawerWhen(pk.p, `${ir.n}p`, id, v => () => html(instRead, v, false));
return { packs: pk?.value ?? null, pending: pk?.p ? `${ir.n}p` : false };
};
if (!ir.done) {
drawerWhen(ir.p, ir.n, id, v => { const s = packsStage(v); return () => html(v, s.packs, s.pending); });
return html(null, null, ir.n);
}
let pk = drawerPacks(org, ir.value, pick.key);
if (pk?.p) {
await Promise.race([pk.p, page ?? pk.p]);
pk = drawerPacks(org, ir.value, pick.key, false);
}
if (pk?.p) {
drawerWhen(pk.p, `${ir.n}p`, id, v => () => html(ir.value, v, false));
return html(ir.value, pk.value, `${ir.n}p`);
}
return html(ir.value, pk?.value ?? null, false);
}
function drawerHtml(pick, { body, business, config, pending, instRead }) {
function drawerHtml(pick, { body, business, config, pending, instRead, packs = null }) {
const { org, key, id } = pick;
const o = orgsOf(body), orgName = o.name(org);
const close = `<button type="button" class="x" data-drawer-close data-focus-key="drawer-close" aria-label="Close the agent details">×</button>`;
const shell = (title, inner, attrs = '') => `<aside class="ws-drawer ws-o" style="${o.style(org)}" role="region" aria-labelledby="ws-drawer-h" data-ws-drawer="${esc(id)}"${attrs}><div class="hd"><h2 id="ws-drawer-h" tabindex="-1" data-focus-key="drawer-h">${esc(title)}</h2>${close}</div><div class="body">${inner}</div></aside>`;
// While the instances read is open, or after it failed, the agent's name is the address's and its
// role, source and state are not known: the state says so, and Stop gives that as its reason.
const unknown = pending ? 'Reading state…' : !instRead?.inst ? `State not read: ${esc(instWhy(instRead || {}))}.` : '';
// role, source and state are not known: the state says so, and Stop gives that as its reason. A drawer
// can be pending with its instances read answered, while a pack hire's packs read is still open.
const reading = pending && !instRead;
const unknown = reading ? 'Reading state…' : !instRead?.inst ? `State not read: ${esc(instWhy(instRead || {}))}.` : '';
const a = unknown ? { org, key, name: key, level: 'org', keep: false, item: {}, s: arr(body?.sessions).find(x => x?.kind === 'role' && x.org === org && x.role === key) || null }
: agentRows([{ id: org, inst: instRead.inst, copies: instRead.copies }], body).find(r => r.key === key);
if (!a) return shell(key, `<p class="note" data-drawer-missing>No agent named ${esc(key)} was read in ${esc(orgName)}.</p>`);
const wsRow = arr(body?.orgs).find(r => r?.org === org) ?? null;
const notRead = names => (!body ? 'the read did not answer' : wsRow?.state !== 'ok' ? busWord({ busStopped: wsRow?.state === 'stopped' }) : missOf(wsRow, names));
const field = (attr, term, value) => `<div class="ws-drawer-f"><dt>${term}</dt><dd data-drawer-${attr}>${value}</dd></div>`;
// Role and where it came from. A hired agent reads as hired; no read names the template it was hired from.
// Role and where it came from. A hired agent reads as hired; Hired from below names its pack.
const item = a.item || {}, def = typeof item.definition === 'string' ? item.definition : '';
const hire = typeof item.hireDecision === 'string' ? item.hireDecision : /^org:hire-(.+)$/.exec(def)?.[1] || '';
const source = a.level === 'org'
? (isHired(item) ? `Hired${hire ? ` by hire decision <code>${esc(hire)}</code>` : ''}${def ? `, definition <code>${esc(def)}</code>` : ''}` : `Organization agent${def ? `, definition <code>${esc(def)}</code>` : ''}`)
: `${a.level === 'project' ? `Project agent copy${a.project?.name ? ` for ${esc(a.project.name)}` : ''}` : 'Root agent copy'}${def ? `, definition <code>${esc(def)}</code>` : ''}${a.id ? `. ${esc(a.id)}` : ''}`;
// SP16: where a hired agent's role came from. A pack hire names its pack and, from the packs read,
// the template; no read names the template of a hire made outside a pack.
let hiredFrom = '';
if (a.level === 'org' && isHired(item)) {
if (packOf(item)) {
const { template: t, label } = packTemplate(item, key, packs);
hiredFrom = `Pack <strong>${esc(label || packOf(item))}</strong>, ${t ? `template <code>${esc(t)}</code> <span class="t2">as the installed pack names it</span>`
: `<span class="muted">template ${!packs && pending ? 'being read…' : packs?.err ? `not read: ${esc(instWhy(packs))}` : 'not named in the packs read'}</span>`}`;
} else hiredFrom = '<span class="muted">Template not recorded: no read names the template of a hire made outside a pack.</span>';
}
const model = business?.business?.instances?.find(i => i?.instance === key)?.vars?.model;
// Its project and task: the role session's (the task it holds, and that task's project), else the
// project of the conversation its live run holds.
@@ -1229,10 +1328,18 @@
const acts = [];
if (chat && thread?.thread) acts.push(`<a class="ws-btn" href="${esc(`#/assistant?add=${enc(`${org}:${thread.thread}`)}`)}" data-drawer-message data-focus-key="drawer-message">Message<span class="ws-sr"> ${esc(a.name)}</span></a>`);
else if (chat && a.level === 'org' && window.MosaicAgents?.isThread?.(def)) acts.push(`<a class="ws-btn" href="#/assistant" data-drawer-message data-focus-key="drawer-message">Message<span class="ws-sr"> ${esc(a.name)}</span></a> <span class="note">Start one from New thread in ${esc(orgName)}.</span>`);
// SP16: where no Message is offered, one line says why. The Console opens a conversation only in an
// Assistant pane, with a conversation agent; a role agent takes messages on the bus, which an
// organizations Console does not send.
else if (chat) acts.push(`<p class="note" data-drawer-nomessage>${reading ? 'No Message: its state is being read, so it is not known whether it holds a conversation.'
: unknown ? `No Message: its state was not read (${esc(instWhy(instRead || {}))}), so it is not known whether it holds a conversation.`
: a.level !== 'org' ? 'No Message: a copy is not messaged from here.'
: 'No Message: this Console messages only conversation agents, such as the Assistant.'}</p>`);
else if (change) acts.push(`<p class="note" data-drawer-nomessage>No Message: this Console does not send chat in ${esc(orgName)}.</p>`);
if (change && a.level === 'org' && !a.keep && running(item) > 0) acts.push(stopActions(pick, a, orgName));
// Why Stop is not offered, in words, where this Console could otherwise change the organization's agents.
// SP13: "not running" is a reason only once the instances read has given the agent's runs.
else if (change) acts.push(`<p class="note" data-drawer-nostop>${pending ? 'Its state is being read. Stop is offered once it is read and the agent is running.'
else if (change) acts.push(`<p class="note" data-drawer-nostop>${reading ? 'Its state is being read. Stop is offered once it is read and the agent is running.'
: unknown || !runsRead(item) ? 'Its state was not read, so Stop is not offered.'
: a.level !== 'org' ? 'A copy is not stopped from here.'
: a.keep ? `${esc(a.name)} is one of ${esc(orgName)}’s protected agents, so it is not stopped from here.`
@@ -1243,12 +1350,19 @@
: `<p class="note" data-drawer-readonly>This Console only reads ${esc(orgName)}. It can not message or stop its agents.</p>`;
const fields = [
field('org', 'Organization', orgChip(o, org)),
unknown ? '' : field('role', 'Role', `${esc(a.role)}`),
// A pack hire's pack is named once, in Hired from; the Role row says only that it was hired.
unknown ? '' : field('role', 'Role', `${esc(hiredFrom && packOf(item) ? 'Hired' : a.role)}`),
unknown ? '' : field('source', 'Source', source),
hiredFrom ? field('hired', 'Hired from', hiredFrom) : '',
field('state', 'State', unknown ? `<span class="muted">${unknown}</span>` : dot(...a.dot, true)),
model ? field('model', 'Model', `<span class="mono">${esc(model)}</span>`) : '',
project ? field('project', 'Project', `<a href="${esc(`${orgHref(org)}/projects/${enc(project.id)}`)}">${esc(project.name || project.key || project.id)}</a>${project.from ? ` <span class="t2">${project.from}</span>` : ''}`) : '',
task ? field('task', 'Task', `<a href="${esc(taskHref(task.ref))}">${esc(task.title || task.ref)}</a>${task.title ? ` <span class="t2 mono">${esc(task.ref)}</span>` : ''}`) : '',
// SP16: no read the Console makes carries the time of a role agent's last message or run. The agents
// read's time is when it took the role and `since` is when its present state began, so neither is shown.
// An agent holding a conversation has its messages in that thread's messages read, but that read pages
// from the oldest message, so its last message is a walk of every page away; the drawer does not make it.
field('activity', 'Last activity', `<span class="muted">${thread?.thread ? 'not shown: reading it means reading the whole conversation' : 'not recorded'}</span>`),
].join('');
return shell(a.name, `<dl class="ws-drawer-fields">${fields}</dl>
<section class="ws-drawer-sec" data-drawer-tasks aria-label="Open tasks assigned to ${esc(a.name)}"><h3>Open tasks</h3>${tasksBody}${tasksAll}</section>
@@ -1266,6 +1380,7 @@
// bus.js calls this after each paint: focus moves into a drawer a row opened, and back to the row
// when the drawer has closed and focus was left nowhere.
function afterPaint() {
for (const node of document.querySelectorAll('#bus-view [data-ws-drawer][data-drawer-pending]')) drawerLateRun(node);
const view = document.getElementById('bus-view'), d = view?.querySelector('[data-ws-drawer]');
const now = d?.dataset.wsDrawer || null, was = drawerShown;
drawerShown = now;
@@ -48,7 +48,7 @@ function fixture() {
projects: [{ id: 'p-shop', repo: 'shop', name: 'Shop', archived: false, at: at(120) }],
tasks: [], inbox: [], claims: [], threads: [],
agents: [{ role: 'pm', holder_run: 'run-9', harness: 'claude', state: 'waiting', at: at(15) }],
instances: { pm: { definition: 'pm', running: ['run-9'] }, 'research-2': { definition: `org:hire-${HIRE}`, hireDecision: HIRE, running: [], pack: { id: 'coding', label: 'Coding' } } },
instances: { pm: { definition: 'pm', running: ['run-9'] }, 'research-2': { definition: `org:hire-${HIRE}`, hireDecision: HIRE, running: [], pack: { id: 'coding', origin: 'shipped', project: null } } },
model: {},
},
};
@@ -84,7 +84,8 @@ function fixture() {
// beta's says it only reads. Agent writes are recorded and answered from a queue; nothing is written.
const STUB = `(() => {
const real = window.fetch.bind(window);
window.__posts = []; window.__answers = [];
window.__posts = []; window.__answers = []; window.__packReads = [];
window.__packsRelease = () => (window.__packsHeld ?? []).splice(0).forEach(r => r());
const answer = (status, body) => new Response(JSON.stringify(body), { status, headers: { 'content-type': 'application/json' } });
window.fetch = async (url, init = {}) => {
const u = String(url);
@@ -94,6 +95,18 @@ const STUB = `(() => {
const writes = cfg[1] === 'acme';
return answer(200, { ...c, chatSend: writes, settingsSend: writes, decide: writes });
}
// SP16: the packs read (owner only). Beta installed the Coding pack, whose hire research-2 is made
// from the researcher definition, and that from the researcher template. The instance names only the
// pack's id, as the bus's does; the pack's document carries its label. A test may set __packsStatus,
// __packsBody (a 200 answer that is not JSON) or __packsHold (each read held answers on __packsRelease()).
const packs = u.match(/^\\/api\\/orgs\\/([^/]+)\\/packs$/);
if (packs) {
window.__packReads.push(packs[1]);
if (window.__packsHold) await new Promise(r => (window.__packsHeld ??= []).push(r));
if (window.__packsStatus) return answer(window.__packsStatus, { error: 'refused' });
if (window.__packsBody) return new Response(window.__packsBody, { status: 200, headers: { 'content-type': 'text/html' } });
return answer(200, { writable: false, applied: [{ id: 'coding', origin: 'shipped', project: null, hired: ['research-2'], open: [] }], packs: packs[1] === 'beta' ? [{ id: 'coding', origin: 'shipped', pack: { id: 'coding', label: 'Coding', version: 2, hires: [{ name: 'research-2', definition: 'researcher', reason: 'Research.' }], definitions: { researcher: { template: 'researcher', sha256: '${'a'.repeat(64)}' } } } }] : [] });
}
if (!/\\/agent\\//.test(u) || (init.method || 'GET') === 'GET' && !u.includes('/agent/request')) return real(url, init);
window.__posts.push({ url: u, method: init.method || 'GET', body: init.body ?? null });
const a = window.__answers.shift();
@@ -102,12 +115,13 @@ const STUB = `(() => {
};
})();`;
async function setup(t, { viewport = [1440, 900], hash = '#/agents', stub = true } = {}) {
async function setup(t, { viewport = [1440, 900], hash = '#/agents', stub = true, scripts = [] } = {}) {
const server = await startServer({ port: 0, sso: createDevOwner(), organizations: fixture(), log: () => {} });
t.after(() => close(server));
const b = await browser({ machine: false }); t.after(() => b.close());
await b.viewport(...viewport);
if (stub) await b.call('Page.addScriptToEvaluateOnNewDocument', { source: STUB });
for (const source of scripts) await b.call('Page.addScriptToEvaluateOnNewDocument', { source });
const base = `http://127.0.0.1:${server.address().port}`;
await b.navigate(`${base}/${hash}`);
const text = sel => b.evaluate(`document.querySelector(${JSON.stringify(sel)})?.innerText.replace(/\\s+/g, " ").trim() ?? null`);
@@ -171,9 +185,13 @@ test('the drawer shows each field from its read: name, organization, role and so
// Decisions waiting on a human that it raised, each into the Inbox. Chief's is not its own.
const decisions = await b.evaluate(`[...document.querySelectorAll('${d} [data-drawer-decisions] li a')].map(a => [a.textContent.trim(), a.getAttribute("href")])`);
assert.deepEqual(decisions, [['Ship the hero copy?', '#/inbox?d=acme%3Adec-1']]);
// No read gives the time of an agent's last activity. The sessions read's `since` is when its
// current state began, which is not the same thing, so the drawer draws no time.
assert.equal(await has(`${d} [data-drawer-activity]`), false);
// SP16: no read gives the time of an agent's last activity. The agents read's time (when it took the
// role) and `since` (when its present state began) are not that, so the drawer says not recorded.
assert.equal(await text(`${d} [data-drawer-activity]`), 'not recorded');
assert.equal(await b.evaluate(`document.querySelector('${d} [data-drawer-activity]').closest('.ws-drawer-f').querySelector('dt').textContent`), 'Last activity');
// Not a pack hire: no packs read, and no Hired from line.
assert.equal(await has(`${d} [data-drawer-hired]`), false);
assert.deepEqual(await b.evaluate('window.__packReads'), []);
// The Tasks board link opens the board filtered to the agent.
await b.evaluate(`document.querySelector('${d} [data-drawer-tasks-all]').click()`);
await wait(`document.querySelector('[data-tasks-board] select[data-tb-filter="assignee"]')?.value === 'coder'`);
@@ -186,19 +204,200 @@ test('a hired agent shows where its role came from; a not-running agent says not
const { wait, text, has } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2' });
await wait(open('beta:research-2'));
const d = '[data-ws-drawer="beta:research-2"]';
assert.match(await text(`${d} [data-drawer-role]`), /Hired from pack Coding/);
// SP16 review 2: the pack is named once, in Hired from; the Role row says only that it was hired.
assert.equal(await text(`${d} [data-drawer-role]`), 'Hired');
assert.match(await text(`${d} [data-drawer-source]`), new RegExp(`hire decision ${HIRE}`));
assert.match(await text(`${d} [data-drawer-state]`), /(^|\s)not running$/);
assert.equal(await has(`${d} [data-drawer-model]`), false);
});
test('SP16: a pack hire names its pack and the template the packs read gives; a refused read says so', async t => {
const { b, base, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2' });
const d = '[data-ws-drawer="beta:research-2"]';
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
assert.equal(await b.evaluate(`document.querySelector('${d} [data-drawer-hired]').closest('.ws-drawer-f').querySelector('dt').textContent`), 'Hired from');
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack Coding, template researcher as the installed pack names it');
// One open makes one packs read, and only for the organization of the pack hire.
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta']);
// The packs read refused (it is the owner's): the pack still shows, and the template says why it is missing.
await b.call('Page.addScriptToEvaluateOnNewDocument', { source: 'window.__packsStatus = 403;' });
await b.navigate('about:blank');
await b.navigate(`${base}/#/agents?agent=beta%3Aresearch-2`);
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template not read: refused');
});
test('SP16 review: a packs read that answers 200 with no JSON says no answer, and the drawer stays', async t => {
const { b, base, wait, text } = await setup(t, { hash: '#/agents', scripts: ['window.__packsBody = "<html>proxy error</html>";'] });
await b.navigate(`${base}/#/agents?agent=beta%3Aresearch-2`);
const d = '[data-ws-drawer="beta:research-2"]';
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template not read: no answer');
assert.match(await text(`${d} [data-drawer-state]`), /not running$/);
});
test('SP16 review: a packs read still open does not hold the page or the state; the template line repaints when it answers', async t => {
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: ['window.__packsHold = true;'] });
const d = '[data-ws-drawer="beta:research-2"]';
await wait(`${open('beta:research-2')} && document.querySelector('${d} [data-drawer-hired]')`);
// The page painted and the state is read while the packs read is held.
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template being read…');
assert.match(await text(`${d} [data-drawer-state]`), /not running$/);
assert.ok(await b.evaluate(`!!document.querySelector('${d}[data-drawer-pending]')`));
await b.evaluate('window.__packsHold = false; window.__packsRelease()');
await wait(`document.querySelector('${d} [data-drawer-hired]')?.textContent.includes('template researcher')`);
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack Coding, template researcher as the installed pack names it');
});
// SP16 review 2 probes. OBS records every agent drawer put on the page; SLOW holds the drawer's own
// workspace read (it names org= and the inbox section) 400 ms, so the page's reads answer first;
// INST_HOLD holds beta's first bus instances read (the drawer's: it is made before the page's) until
// window.__instRelease().
const OBS = `(() => {
window.__ins = [];
new MutationObserver(ms => { for (const m of ms) for (const n of m.addedNodes) {
const list = n.nodeType === 1 ? [n, ...n.querySelectorAll('[data-ws-drawer]')] : [];
for (const e of list) if (e.matches?.('[data-ws-drawer]')) window.__ins.push({ id: e.dataset.wsDrawer, pending: e.dataset.drawerPending || null, hired: e.querySelector('[data-drawer-hired]')?.textContent.trim() ?? null });
} }).observe(document, { childList: true, subtree: true });
})();`;
const SLOW = `(() => { const f = window.fetch; window.fetch = async (u, i) => { if (/\\/api\\/workspace\\?.*org=/.test(String(u)) && /inbox/.test(decodeURIComponent(String(u)))) await new Promise(r => setTimeout(r, 400)); return f(u, i); }; })();`;
const INST_HOLD = `(() => { const f = window.fetch; let n = 0; window.fetch = async (u, i) => { if (/\\/api\\/orgs\\/beta\\/bus\\/instances$/.test(String(u)) && ++n === 1) await new Promise(r => { window.__instRelease = r; }); return f(u, i); }; })();`;
const renders = async (b, wait, count) => {
for (let i = 0; i < count; i++) {
const seen = await b.evaluate('window.__ins.length');
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'))`);
await wait(`window.__ins.length > ${seen}`);
await new Promise(r => setTimeout(r, 700));
}
};
test('SP16 review 2: a repaint draws the template from the kept packs answer, so the line does not change and one packs read serves the repaints', async t => {
const { b, wait } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, SLOW] });
const d = '[data-ws-drawer="beta:research-2"]';
const final = 'Pack Coding, template researcher as the installed pack names it';
await wait(`document.querySelector('${d} [data-drawer-hired]')?.textContent.includes('template researcher')`);
const from = await b.evaluate('window.__ins.length');
await renders(b, wait, 3);
const later = JSON.parse(await b.evaluate(`JSON.stringify(window.__ins.slice(${from}))`)).filter(x => x.id === 'beta:research-2');
assert.ok(later.length >= 3, JSON.stringify(later));
for (const x of later) assert.deepEqual([x.hired, x.pending], [final, null], JSON.stringify(later));
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta']);
});
test('SP16 review 2: when the instances read answers after the page, the state shows at once while the packs read is still held', async t => {
const { b, wait, text, has } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [INST_HOLD, 'window.__packsHold = true;'] });
const d = '[data-ws-drawer="beta:research-2"]';
await wait(`${open('beta:research-2')} && typeof window.__instRelease === 'function'`);
assert.equal(await text(`${d} [data-drawer-state]`), 'Reading state…');
assert.equal(await has(`${d} [data-drawer-hired]`), false);
await b.evaluate('window.__instRelease()');
await wait(`/not running$/.test(document.querySelector('${d} [data-drawer-state]')?.textContent ?? '')`);
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack coding, template being read…');
assert.equal(await text(`${d} [data-drawer-role]`), 'Hired');
assert.equal(await has(`${d}[data-drawer-pending]`), true);
await b.evaluate('window.__packsHold = false; window.__packsRelease()');
await wait(`document.querySelector('${d} [data-drawer-hired]')?.textContent.includes('template researcher')`);
assert.equal(await text(`${d} [data-drawer-hired]`), 'Pack Coding, template researcher as the installed pack names it');
assert.match(await text(`${d} [data-drawer-state]`), /not running$/);
assert.equal(await has(`${d}[data-drawer-pending]`), false);
});
test('SP16 review 2: a drawer whose reads have all answered is not marked pending and is not swapped after paint', async t => {
const { b, wait } = await setup(t, { hash: '#/agents?agent=acme%3Acoder', scripts: [OBS, SLOW] });
await wait(`${open('acme:coder')} && /working$/.test(document.querySelector('[data-ws-drawer="acme:coder"] [data-drawer-state]')?.textContent ?? '')`);
const from = await b.evaluate('window.__ins.length');
await renders(b, wait, 2);
const later = JSON.parse(await b.evaluate(`JSON.stringify(window.__ins.slice(${from}))`)).filter(x => x.id === 'acme:coder');
assert.equal(later.length, 2, JSON.stringify(later));
assert.ok(later.every(x => x.pending === null), JSON.stringify(later));
});
// SP16 review 3: HIRE3 adds a later hire of the Coding pack, research-3, to beta's instances read once
// window.__hire3 is set, and to the packs read's Coding hires once window.__packs3 is set. SKEW moves
// Date.now on by window.__skew ms.
const HIRE3 = `(() => {
const f = window.fetch;
const json = (r, v) => new Response(JSON.stringify(v), { status: r.status, headers: { 'content-type': 'application/json' } });
window.fetch = async (u, i) => {
const r = await f(u, i), s = String(u);
if (window.__hire3 && /\\/api\\/orgs\\/beta\\/bus\\/instances$/.test(s) && r.ok) {
const v = await r.clone().json();
(v.rows?.[0]?.instances ?? v.instances)['research-3'] = { definition: 'org:hire-${HIRE.replace('0f3c', '1f3c')}', hireDecision: '${HIRE.replace('0f3c', '1f3c')}', running: [], pack: { id: 'coding', origin: 'shipped', project: null } };
return json(r, v);
}
if (window.__packs3 && /\\/api\\/orgs\\/beta\\/packs$/.test(s) && r.ok) {
const v = await r.clone().json();
v.packs[0].pack.hires.push({ name: 'research-3', definition: 'researcher', reason: 'More research.' });
return json(r, v);
}
return r;
};
})();`;
const SKEW = `(() => { const n = Date.now; Date.now = () => n() + (window.__skew || 0); })();`;
const FINAL = 'Pack Coding, template researcher as the installed pack names it';
const hiredText = key => `(document.querySelector('[data-ws-drawer="${key}"] [data-drawer-hired]')?.textContent ?? '')`;
test('SP16 review 3: a hire made after the packs answer was kept is read again at once, and its drawer never says the pack does not name it', async t => {
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, HIRE3] });
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
await b.evaluate('window.__hire3 = true; window.__packs3 = true; location.hash = "#/agents?agent=beta%3Aresearch-3"');
await wait(`${hiredText('beta:research-3')}.includes('template researcher')`);
assert.equal(await text('[data-ws-drawer="beta:research-3"] [data-drawer-hired]'), FINAL);
const seen = JSON.parse(await b.evaluate('JSON.stringify(window.__ins)')).filter(x => x.id === 'beta:research-3');
assert.ok(seen.length >= 1 && seen.every(x => !/not named/.test(x.hired ?? '')), JSON.stringify(seen));
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
});
test('SP16 review 3: a hire the pack does not name is read again once, then says so without a packs read on every repaint', async t => {
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, HIRE3] });
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
await b.evaluate('window.__hire3 = true; location.hash = "#/agents?agent=beta%3Aresearch-3"');
await wait(`${hiredText('beta:research-3')}.includes('not named')`);
assert.equal(await text('[data-ws-drawer="beta:research-3"] [data-drawer-hired]'), 'Pack Coding, template not named in the packs read');
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
await renders(b, wait, 2);
assert.equal(await text('[data-ws-drawer="beta:research-3"] [data-drawer-hired]'), 'Pack Coding, template not named in the packs read');
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
});
test('SP16 review 3: a packs read that failed is read again on the next render, so the line recovers with the route', async t => {
const { b, wait, text } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, 'window.__packsStatus = 503;'] });
await wait(`${hiredText('beta:research-2')}.includes('not read')`);
assert.equal(await text('[data-ws-drawer="beta:research-2"] [data-drawer-hired]'), 'Pack coding, template not read: no answer');
// A kept failure is read again on each render (at most one read open), as before the answer was kept.
await new Promise(r => setTimeout(r, 700));
const failed = await b.evaluate('window.__packReads.length');
await b.evaluate(`window.__packsStatus = 0; document.dispatchEvent(new CustomEvent('mosaic-workspace-render'))`);
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
assert.equal(await text('[data-ws-drawer="beta:research-2"] [data-drawer-hired]'), FINAL);
assert.equal(await b.evaluate('window.__packReads.length'), failed + 1);
// Recovered, the answer is kept again: a further repaint makes no read.
await renders(b, wait, 1);
assert.equal(await b.evaluate('window.__packReads.length'), failed + 1);
});
test('SP16 review 3: once the kept packs answer is 60 s old a repaint still draws it, with one new read and no swap when that read answers', async t => {
const { b, wait } = await setup(t, { hash: '#/agents?agent=beta%3Aresearch-2', scripts: [OBS, SLOW, SKEW] });
await wait(`${hiredText('beta:research-2')}.includes('template researcher')`);
const from = await b.evaluate('window.__ins.length');
await b.evaluate('window.__skew = 61000; window.__packsHold = true;');
await renders(b, wait, 1);
await wait('window.__packReads.length === 2');
await b.evaluate('window.__packsHold = false; window.__packsRelease()');
await new Promise(r => setTimeout(r, 700));
const later = JSON.parse(await b.evaluate(`JSON.stringify(window.__ins.slice(${from}))`)).filter(x => x.id === 'beta:research-2');
assert.equal(later.length, 1, JSON.stringify(later));
assert.deepEqual([later[0].hired, later[0].pending], [FINAL, null]);
assert.deepEqual(await b.evaluate('window.__packReads'), ['beta', 'beta']);
});
test('a field with no read is left out', async t => {
// beta:pm: beta's business read names no model for it, and it holds no task, so no project either.
const { wait, has, text } = await setup(t, { hash: '#/agents?agent=beta%3Apm' });
await wait(open('beta:pm'));
const d = '[data-ws-drawer="beta:pm"]';
assert.match(await text(`${d} [data-drawer-state]`), /waiting on you/);
for (const field of ['model', 'project', 'task', 'activity']) assert.equal(await has(`${d} [data-drawer-${field}]`), false, `${field} should be absent`);
for (const field of ['model', 'project', 'task', 'hired']) assert.equal(await has(`${d} [data-drawer-${field}]`), false, `${field} should be absent`);
// An empty list still says so, since the read answered: no open tasks, no decisions.
assert.match(await text(`${d} [data-drawer-tasks]`), /No open tasks/);
assert.match(await text(`${d} [data-drawer-decisions]`), /No decisions/);
@@ -300,10 +499,16 @@ test('Message opens the agent\'s thread in an Assistant pane; Stop asks first an
const { b, wait, text, attr, has } = await setup(t, { hash: '#/agents?agent=acme%3Aassistant' });
await wait(`${open('acme:assistant')} && document.querySelector('[data-ws-drawer="acme:assistant"] [data-drawer-message]')`);
assert.equal(await attr('[data-ws-drawer="acme:assistant"] [data-drawer-message]', 'href'), `#/assistant?add=acme%3A${THREAD}`);
// SP16: Message is offered, so no line says why it is not.
assert.equal(await has('[data-ws-drawer="acme:assistant"] [data-drawer-nomessage]'), false);
// It holds a conversation, whose messages read pages from the oldest message: the drawer says it does not read it.
assert.equal(await text('[data-ws-drawer="acme:assistant"] [data-drawer-activity]'), 'not shown: reading it means reading the whole conversation');
// A role agent holds no thread to open, so it has no Message; it can still be stopped.
await b.evaluate('location.hash = "#/agents?agent=acme%3Acoder"');
await wait(`${open('acme:coder')} && document.querySelector('[data-ws-drawer="acme:coder"] [data-drawer-stop]')`);
assert.equal(await has('[data-ws-drawer="acme:coder"] [data-drawer-message]'), false);
// SP16: and one line says why there is no Message.
assert.equal(await text('[data-ws-drawer="acme:coder"] [data-drawer-actions] [data-drawer-nomessage]'), 'No Message: this Console messages only conversation agents, such as the Assistant.');
const d = '[data-ws-drawer="acme:coder"]';
await b.evaluate(`document.querySelector('${d} [data-drawer-stop]').click()`);
await wait(`document.querySelector('${d} [data-drawer-stop-yes]')`);
@@ -351,6 +556,7 @@ test('Message opens the agent\'s thread in an Assistant pane; Stop asks first an
await b.evaluate('location.hash = "#/agents?agent=acme%3Achief"');
await wait(open('acme:chief'));
assert.equal(await has('[data-ws-drawer="acme:chief"] [data-drawer-stop]'), false);
assert.match(await text('[data-ws-drawer="acme:chief"] [data-drawer-nomessage]'), /^No Message: this Console messages only conversation agents/);
// Where Stop is not offered, the drawer says why beside the actions.
assert.match(await text('[data-ws-drawer="acme:chief"] [data-drawer-actions] [data-drawer-nostop]'), /^chief is one of Acme Studio’s protected agents, so it is not stopped from here\.$/);
});
@@ -359,7 +565,7 @@ test('no action is shown where the Console cannot write for the agent\'s organiz
const { wait, has, text } = await setup(t, { hash: '#/agents?agent=beta%3Apm' });
await wait(`${open('beta:pm')} && document.querySelector('[data-ws-drawer="beta:pm"] [data-drawer-readonly]')`);
const d = '[data-ws-drawer="beta:pm"]';
for (const action of ['message', 'stop', 'restart']) assert.equal(await has(`${d} [data-drawer-${action}]`), false, `${action} should be absent`);
for (const action of ['message', 'nomessage', 'stop', 'restart']) assert.equal(await has(`${d} [data-drawer-${action}]`), false, `${action} should be absent`);
assert.match(await text(`${d} [data-drawer-readonly]`), /only reads Beta Works/);
});
@@ -1,6 +1,7 @@
// E2E6 P1-1, P2-2 (#1873): an editor in use on an organization's page survives the page's refresh. The
// workflow editor's node, typed draft and focus, the autonomy form's unsaved choice and a pack's picked
// project are kept when the page reads every section again. An apply refreshes the other sections.
// autonomy form's unsaved choice and a pack's picked project are kept when the page reads every section
// again. An apply refreshes the other sections. SP17: the workflow editor is the graph page's step form
// now (the organization page's old form is gone); its node, typed step and focus survive the poll there.
import test from 'node:test';
import assert from 'node:assert/strict';
import { startServer } from '../src/serve.mjs';
@@ -54,9 +55,9 @@ async function fixture(t) {
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/acme/organization`);
// poll: wait for the page's own 10-second poll. Otherwise send the event a write on the page sends,
// which repaints /organization the same way.
const refresh = async ({ poll = false } = {}) => {
const refresh = async ({ poll = false, event = 'mosaic-org-changed' } = {}) => {
const n = counts.workflows;
if (!poll) await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-org-changed',{detail:{org:'acme'}}));true`);
if (!poll) await b.evaluate(`document.dispatchEvent(new CustomEvent(${JSON.stringify(event)},{detail:{org:'acme'}}));true`);
for (let i = 0; i < 500 && counts.workflows === n; i++) await new Promise(r => setTimeout(r, 30));
assert.ok(counts.workflows > n, 'the refresh read the workflows again');
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),200))`);
@@ -64,29 +65,39 @@ async function fixture(t) {
return { b, counts, ctl, refresh };
}
test('E2E6 P1-1: an open workflow editor keeps its node, draft and focus across a refresh', { timeout: 60000 }, async t => {
const { b, refresh } = await fixture(t);
await waitFor(b, `document.querySelector('[data-wf="intake"] [data-wf-edit]')`, 'workflow list');
await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-edit]').click();true`);
await waitFor(b, `document.querySelector('[data-wf-editor]')`, 'editor');
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');window.__editor=f;const i=f.querySelector('input[name=title]');i.value='Intake, revised';i.focus();i.setSelectionRange(3,3);f.querySelector('[data-wf-edit-step="0"] [name=roles]').value='human, coder'}true`);
test('E2E6 P1-1: an open workflow step form keeps its node, typed step and focus across the poll and a failed read', { timeout: 90000 }, async t => {
const { b, ctl, refresh } = await fixture(t);
const form = '[data-wfg-step-form="0"]';
await b.evaluate(`location.hash = '#/orgs/acme/workflows/intake?step=1'`);
await waitFor(b, `document.querySelector('${form} input[name=title]')?.value === 'Sort'`, 'step form');
await b.evaluate(`{const f=document.querySelector('${form}');window.__form=f;const i=f.querySelector('input[name=title]');i.value='Sort, revised';i.dispatchEvent(new Event('input',{bubbles:true}));f.querySelector('input[name=role][value=coder]').click();i.focus();i.setSelectionRange(3,3)}true`);
await waitFor(b, `document.querySelector('${form}')?.hasAttribute('data-live-hold')`, 'the typed form holds');
await refresh({ poll: true });
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')===window.__editor`), true, 'the same editor node');
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf-editor]').length`), 1);
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), 'Intake, revised');
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] [data-wf-edit-step="0"] [name=roles]').value`), 'human, coder');
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('[data-wf-editor] input[name=title]')`), true, 'focus stays in the field');
assert.equal(await b.evaluate(`document.querySelector('${form}')===window.__form`), true, 'the same form node');
assert.equal(await b.evaluate(`document.querySelectorAll('${form}').length`), 1);
assert.equal(await b.evaluate(`document.querySelector('${form} input[name=title]').value`), 'Sort, revised');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('${form} input[name=role]:checked')].map(i=>i.value)`), ['human', 'coder']);
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('${form} input[name=title]')`), true, 'focus stays in the field');
assert.equal(await b.evaluate(`document.activeElement.selectionStart`), 3, 'the caret stays put');
// A second refresh with focus elsewhere still keeps the open editor: it holds data-live-hold.
// A second repaint with focus elsewhere still keeps the typed form: it holds data-live-hold.
await b.evaluate(`document.activeElement.blur();true`);
await refresh();
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')===window.__editor`), true);
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), 'Intake, revised');
// Cancel closes it; the next refresh paints the list fresh.
await b.evaluate(`document.querySelector('[data-wf-cancel]').click();true`);
await waitFor(b, `!document.querySelector('[data-wf-editor]')`, 'cancel');
await refresh();
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')`), null);
await refresh({ event: 'mosaic-workspace-render' });
assert.equal(await b.evaluate(`document.querySelector('${form}')===window.__form`), true);
assert.equal(await b.evaluate(`document.querySelector('${form} input[name=title]').value`), 'Sort, revised');
// A failed read keeps the same form, its typed step and focus, and says the read failed.
await b.evaluate(`document.querySelector('${form} input[name=title]').focus();true`);
ctl.workflowsFail = true;
await refresh({ poll: true });
await waitFor(b, `/The last workflows read failed/.test(document.querySelector('[data-wfg-error]')?.textContent ?? '')`, 'the read failure is said');
assert.equal(await b.evaluate(`document.querySelector('${form}')===window.__form`), true, 'the same form node after a failed read');
assert.equal(await b.evaluate(`document.querySelector('${form} input[name=title]').value`), 'Sort, revised');
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('${form} input[name=title]')`), true, 'focus stays in the field');
ctl.workflowsFail = false;
// Reset step puts the step back; the next repaint draws the form fresh, not held.
await b.evaluate(`document.querySelector('${form} [data-wfg-cancel]').click();true`);
await waitFor(b, `document.querySelector('${form} input[name=title]')?.value === 'Sort' && !document.querySelector('${form}').hasAttribute('data-live-hold')`, 'reset');
await refresh({ event: 'mosaic-workspace-render' });
await waitFor(b, `!document.querySelector('[data-wfg-error]') && document.querySelector('${form}') && document.querySelector('${form}')!==window.__form`, 'a fresh form after a good read');
});
test('E2E6 P1-1, P2-14: an unsaved autonomy choice, a picked pack project and a focused link survive the poll', { timeout: 60000 }, async t => {
@@ -113,16 +124,17 @@ test('E2E6 P2-2: a pack apply re-reads the other sections and keeps its receipt'
const before = { ...counts };
await b.evaluate(`document.querySelector('[data-pack-apply]').click();true`);
await waitFor(b, `/^Applied\\./.test(document.querySelector('[data-packs-status]')?.textContent??'')`, 'apply');
for (let i = 0; i < 300 && counts.workflows === before.workflows; i++) await new Promise(r => setTimeout(r, 30));
// Both reads are waited for: the autonomy read can answer after the workflows read on a loaded host.
for (let i = 0; i < 300 && (counts.workflows === before.workflows || counts.autonomy === before.autonomy); i++) await new Promise(r => setTimeout(r, 30));
assert.ok(counts.workflows > before.workflows, 'workflows read again after the apply');
assert.ok(counts.autonomy > before.autonomy, 'autonomy read again after the apply');
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),300))`);
assert.match(await b.evaluate(`document.querySelector('[data-packs-status]').textContent`), /^Applied\. Added board\./, 'the receipt survives the re-read');
});
test('E2E6 review P3: a failed read keeps an open editor, Discard drops a held form, a focused button does not hold its section, and a clean form shows a failed read', { timeout: 60000 }, async t => {
test('E2E6 review P3: a failed read keeps a dirty form, Discard drops a held form, a focused button does not hold its section, and a clean form shows a failed read', { timeout: 60000 }, async t => {
const { b, ctl, refresh } = await fixture(t);
await waitFor(b, `document.querySelector('[data-wf="intake"] [data-wf-edit]')&&document.querySelector('[data-autonomy-form] select[name=merge]')&&document.querySelector('[data-pack-preview-button]')`, 'sections');
await waitFor(b, `document.querySelector('[data-autonomy-form] select[name=merge]')&&document.querySelector('[data-pack-preview-button]')`, 'sections');
// A focused Preview button alone no longer holds the packs section: the next poll shows a changed
// pack and focus comes back to the rebuilt button through its data-focus-key.
await b.evaluate(`document.querySelector('[data-pack-preview-button]').focus();true`);
@@ -130,18 +142,11 @@ test('E2E6 review P3: a failed read keeps an open editor, Discard drops a held f
await refresh({ poll: true });
await waitFor(b, `/Web project, renamed/.test(document.querySelector('[data-packs-org]').textContent)`, 'the renamed pack');
assert.match(await b.evaluate(`document.activeElement.dataset.focusKey??document.activeElement.tagName`), /^pack-preview:acme:web-project$/, 'focus returns to the rebuilt button');
// One failed workflows read while the editor is open keeps the same editor node, draft and focus.
await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-edit]').click();true`);
await waitFor(b, `document.querySelector('[data-wf-editor]')`, 'editor');
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');window.__editor=f;const i=f.querySelector('input[name=title]');i.value='Typed during an outage';i.focus()}true`);
// A dirty autonomy form survives a failed autonomy read the same way.
// A dirty autonomy form survives a failed read (the workflow step form's case is the first test).
await b.evaluate(`{const s=document.querySelector('[data-autonomy-form] select[name=merge]');s.value='in the loop';s.dispatchEvent(new Event('change',{bubbles:true}));window.__auto=document.querySelector('[data-autonomy-form]')}true`);
await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').focus();true`);
await b.evaluate(`document.activeElement.blur();true`);
ctl.workflowsFail = true; ctl.autonomyFail = true;
await refresh({ poll: true });
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor]')===window.__editor`), true, 'the same editor node after a failed read');
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), 'Typed during an outage');
assert.equal(await b.evaluate(`document.activeElement===document.querySelector('[data-wf-editor] input[name=title]')`), true, 'focus stays in the field');
assert.equal(await b.evaluate(`document.querySelector('[data-autonomy-form]')===window.__auto`), true, 'the dirty autonomy form is kept after a failed read');
// Discard draws the last read in place of the held form.
ctl.workflowsFail = false; ctl.autonomyFail = false;
@@ -171,6 +171,15 @@ test('the Settings card fits at 1440 with the drawer open, at 735 and 390 withou
assert.equal(tops.length, 2);
assert.notEqual(tops[0][0], tops[1][0], 'the columns sit side by side at 1440');
assert.equal(tops[0][1], tops[1][1], 'the first headings start level');
// SP16: the Workflows card sits under Active agent sessions, so the left column is not empty below
// the sessions and the Settings column holds Settings alone. How near level the two end depends on
// how many agents the sessions list has; the Settings card is the taller with three.
const cols = await b.evaluate(`[...document.querySelectorAll('#bus-view .ws-dash>.ws-split>section')].map(s => ({ wf: !!s.querySelector('[data-wfg-card]'), heads: [...s.querySelectorAll('h2')].map(h => h.textContent.trim()) }))`);
assert.deepEqual(cols.map(c => c.wf), [true, false], `the Workflows card is in the left column: ${JSON.stringify(cols)}`);
assert.equal(cols[0].heads[0], 'Active agent sessions');
assert.deepEqual(cols[1].heads, ['Settings']);
const gap = await b.evaluate(`(() => { const left = document.querySelector('#bus-view .ws-dash>.ws-split>section'), card = left.querySelector('[data-wfg-card]'), above = card.previousElementSibling; return Math.round(card.getBoundingClientRect().top - above.getBoundingClientRect().bottom); })()`);
assert.ok(gap >= 0 && gap <= 40, `the Workflows card follows the sessions directly: ${gap}px`);
});
test('the bare organization address with a query is the organization page, query kept; ?agent= opens the drawer', async t => {
@@ -234,6 +243,28 @@ test('SP14 review: another agent opened while the drawer\'s instances read is op
assert.equal(await has('[data-ws-drawer="acme:coder"]'), false);
});
// SP16 (#1873): the page's own metrics read, held when a test asks, so the drawer's instances read can
// answer after the drawer's HTML is built and before the page that carries it is on screen.
const HOLD_WS = `(() => { const real = window.fetch; let held = false; window.fetch = async (url, init) => { const u = String(url); if (!held && /^\\/api\\/workspace\\?/.test(u) && /metrics/.test(u)) { held = true; await new Promise(done => { window.__releaseWs = done; }); } return real(url, init); }; })();`;
test('SP16: a drawer whose instances read answers after its HTML is built, before it is on screen, still repaints', async t => {
const { b, wait, text, has } = await setup(t, { hash: '#/orgs/acme/organization?agent=acme%3Acoder', inst: 'hold', scripts: [HOLD_WS] });
const d = '[data-ws-drawer="acme:coder"]';
// The page's metrics read is held; the page's other reads answer, so the drawer builds its pending HTML.
await wait('typeof window.__releaseWs === "function" && typeof window.__release === "function"');
await b.evaluate('new Promise(r => setTimeout(r, 600))');
assert.equal(await has(d), false, 'the page is not on screen yet');
// The instances read answers in the gap, then the page paints.
await b.evaluate('window.__release()');
await b.evaluate('new Promise(r => setTimeout(r, 200))');
await b.evaluate('window.__releaseWs()');
await wait(`${settled} && ${open('acme:coder')}`);
await b.evaluate('new Promise(r => setTimeout(r, 1000))');
assert.equal(await has(`${d}[data-drawer-pending]`), false, 'the drawer still says Reading state… after its read answered');
assert.match(await text(`${d} [data-drawer-state]`), /(^|\s)working$/);
assert.equal(await has(`${d} [data-drawer-stop]`), true);
});
test('a drawer closed before its instances read answers keeps no answer for the next open', async t => {
const idle = 'window.__heldIdle = true;';
const { b, wait, text } = await setup(t, { hash: '#/orgs/acme/organization?agent=acme%3Acoder', inst: 'hold', scripts: [idle] });
@@ -1,8 +1,9 @@
// Starter packs SP6 (#1873): the owner's pack picker and workflow editor on an organization's page,
// driven in Chromium against stand-in pack verbs and a stand-in workflow read. It checks what the page
// shows from what the bus returns: the preview's marks, flagged lines, credential lines and noHire mark;
// a step role that no longer resolves; an organization-supplied title or label rendered as text; and
// the save and delete requests the editor sends.
// Starter packs SP6 (#1873): the owner's pack picker on an organization's page, and the organization's
// workflows, driven in Chromium against stand-in pack verbs and a stand-in workflow read. It checks what the
// page shows from what the bus returns: the preview's marks, flagged lines, credential lines and noHire mark;
// a step role that no longer resolves; an organization-supplied title or label rendered as text; and the save
// and delete requests the workflow pages send. SP17: the organization page's old workflow form is gone; the
// graph pages (#/orgs/<id>/workflows) are the one editor, so the workflow test drives those.
import test from 'node:test';
import assert from 'node:assert/strict';
import { startServer } from '../src/serve.mjs';
@@ -134,76 +135,99 @@ test('SP6 pack picker without send previews but offers no apply', { timeout: 600
await waitFor(b, `document.querySelector('[data-pack-preview]')`, 'preview');
assert.equal(await b.evaluate(`document.querySelector('[data-pack-apply]')`), null);
assert.match(await b.evaluate(`document.querySelector('[data-pack-preview]').textContent`), /started without send/);
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit],[data-wf-new]')`), null, 'no workflow change controls without send');
// Without send the workflow read is not writable: the graph page shows the step as text and no form.
await b.evaluate(`location.hash = '#/orgs/acme/workflows/intake?step=1'`);
await waitFor(b, `document.querySelector('[data-wfg-detail] [data-wfg-field="roles"]')`, 'read-only step');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form],[data-wfg-save],[data-wfg-delete],[data-wf-edit],[data-wf-new]')`), null, 'no workflow change controls without send');
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-readonly]')`));
});
test('SP6 workflows: list by scope, a step naming no current role, titles as text, edit, new and delete', { timeout: 60000 }, async t => {
test('SP6 workflows: list by scope, a step naming no current role, titles as text, edit, new and delete', { timeout: 90000 }, async t => {
const { b, verbs, flows } = await fixture(t);
await waitFor(b, `document.querySelector('[data-wf="intake"]')`, 'workflow list');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wf-scope-list]')].map(n=>n.dataset.wfScopeList)`), ['', 'site']);
assert.equal(await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-title]').textContent`), `Intake ${XSS}`);
assert.equal(await b.evaluate(`document.querySelectorAll('[data-workflows] img').length`), 0, 'a workflow title never becomes markup');
const press = sel => b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});if(!e)throw Error('no '+${JSON.stringify(sel)});if(e.disabled)throw Error('disabled '+${JSON.stringify(sel)});e.click();return true})()`);
const fill = (sel, value) => b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});e.value=${JSON.stringify(value)};e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
const text = sel => b.evaluate(`(document.querySelector(${JSON.stringify(sel)})?.textContent ?? '').replace(/\\s+/g,' ').trim()`);
const sets = () => verbs.filter(([v]) => v === 'workflow.set.console');
// The organization page: the Workflows card, no old form.
await waitFor(b, `document.querySelectorAll('[data-wfg-card] [data-wfg-card-item]').length === 2`, 'workflow card');
assert.equal(await b.evaluate(`document.querySelector('[data-workflows],[data-wf-edit],[data-wf-new]')`), null, 'the old organization-page editor is gone');
assert.equal(await b.evaluate(`document.querySelectorAll('[data-org-dashboard] img').length`), 0, 'a workflow title never becomes markup');
// The list: each scope, titles as text.
await b.evaluate(`location.hash = '#/orgs/acme/workflows'`);
await waitFor(b, `document.querySelector('[data-wfg-item="intake"]')`, 'workflow list');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-scope-list]')].map(n=>n.dataset.wfgScopeList)`), ['', 'site']);
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-item="intake"] a[data-wfg-open]').textContent`), `Intake ${XSS}`);
assert.equal(await b.evaluate(`document.querySelectorAll('#bus-view img').length`), 0);
assert.equal(await b.evaluate(`window.__sp6pwn===undefined`), true);
// triage (an org definition), human and coder (a template) resolve; ghost names no current role.
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wf="intake"] [data-wf-step]')].map(s=>s.querySelectorAll('[data-wf-missing]').length)`), [0, 1]);
assert.match(await b.evaluate(`document.querySelectorAll('[data-wf="intake"] [data-wf-step]')[1].textContent`), /ghost names no current role/);
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf="ship"] [data-wf-missing]').length`), 0);
// Edit: the ghost step shows the mark in the editor; fixing the role clears it; save sends the revision.
await b.evaluate(`document.querySelector('[data-wf="intake"] [data-wf-edit]').click();true`);
await waitFor(b, `document.querySelector('[data-wf-editor]')`, 'editor');
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit-step="1"] [data-wf-step-missing]').textContent`), 'ghost names no current role');
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value`), `Intake ${XSS}`);
await b.evaluate(`{const r=document.querySelector('[data-wf-edit-step="1"] [name=roles]');r.value='reviewer, <b>x</b>';r.dispatchEvent(new Event('input',{bubbles:true}))}true`);
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit-step="1"] [data-wf-step-missing]').textContent`), '<b>x</b> names no current role');
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf-edit-step="1"] b').length`), 0);
await b.evaluate(`{const r=document.querySelector('[data-wf-edit-step="1"] [name=roles]');r.value='reviewer';r.dispatchEvent(new Event('input',{bubbles:true}))}true`);
assert.equal(await b.evaluate(`document.querySelector('[data-wf-edit-step="1"] [data-wf-step-missing]').textContent`), '');
await b.evaluate(`document.querySelector('[data-wf-editor] input[name=title]').value='Intake';document.querySelector('[data-wf-editor]').requestSubmit();true`);
await waitFor(b, `document.querySelector('[data-workflows-status]').textContent==='Saved intake.'`, 'save status');
const saved = verbs.filter(([v]) => v === 'workflow.set.console').at(-1)[1];
assert.deepEqual(saved, { revision: REV('a'), name: 'intake', workflow: { title: 'Intake', description: `Sort ${XSS}`, steps: [{ title: `Sort ${XSS}`, state: 'todo', roles: ['triage', 'human'] }, { title: 'Hand off', state: 'in-progress', roles: ['reviewer'] }] } });
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wf="intake"] [data-wf-missing]').length`), 0, 'the re-read shows the fixed step');
// The graph: triage (an organization role), human and coder (a template) resolve; ghost names no current role.
await b.evaluate(`location.hash = '#/orgs/acme/workflows/intake'`);
await waitFor(b, `document.querySelectorAll('[data-wfg-graph] [data-wfg-step]').length === 2 && document.querySelector('[data-wfg-meta-form]')`, 'graph');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-graph] [data-wfg-step]')].map(s=>s.querySelectorAll('[data-wfg-missing]').length)`), [0, 1]);
assert.equal(await b.evaluate(`document.querySelectorAll('#bus-view img').length`), 0);
// The workflow title changes in the panel with no step selected; it is held until Save.
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-meta-form] input[name=title]').value`), `Intake ${XSS}`);
await fill('[data-wfg-meta-form] input[name=title]', 'Intake');
// Step 2's form marks ghost; swapping it for reviewer clears the mark in the graph.
await b.evaluate(`document.querySelector('[data-wfg-step="2"]').dispatchEvent(new MouseEvent('click',{bubbles:true,cancelable:true}));true`);
await waitFor(b, `document.querySelector('[data-wfg-step-form="1"]')`, 'step 2 form');
assert.match(await text('[data-wfg-step-form="1"] [data-wfg-roles-pick]'), /ghost names no current role/);
await press('[data-wfg-step-form="1"] input[name="role"][value="ghost"]');
await press('[data-wfg-step-form="1"] input[name="role"][value="reviewer"]');
await waitFor(b, `document.querySelectorAll('[data-wfg-graph] [data-wfg-missing]').length === 0`, 'mark cleared in the graph');
assert.equal(sets().length, 0, 'nothing sent before Save');
await press('[data-wfg-step-form="1"] [data-wfg-save]');
await waitFor(b, `/Saved intake\\./.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'save status');
assert.deepEqual(sets().at(-1)[1], { revision: REV('a'), name: 'intake', workflow: { title: 'Intake', description: `Sort ${XSS}`, steps: [{ title: `Sort ${XSS}`, state: 'todo', roles: ['triage', 'human'] }, { title: 'Hand off', state: 'in-progress', roles: ['reviewer'] }] } });
assert.equal(await b.evaluate(`document.querySelector('#bus-view h1').textContent`), 'Intake');
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wfg-graph] [data-wfg-missing]').length`), 0, 'the saved workflow shows the fixed step');
// New, in the project scope: a bad name is refused on the page and sends nothing.
const sets = () => verbs.filter(([v]) => v === 'workflow.set.console').length;
const before = sets();
await b.evaluate(`document.querySelector('[data-wf-new]').click();true`);
await waitFor(b, `document.querySelector('[data-wf-editor] select[name=scope]')`, 'new editor');
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.scope.value='site';f.elements.name.value='Bad Name';f.querySelector('[data-wf-edit-step="0"] [name=title]').value='Plan';f.querySelector('[data-wf-edit-step="0"] [name=roles]').value='human';f.requestSubmit()}true`);
await waitFor(b, `/lowercase/.test(document.querySelector('[data-workflows-status]').textContent)`, 'name refusal');
assert.equal(sets(), before);
// The writer's name rule (PLAN_NAME): no underscore, dot or leading digit. Each is refused here, not at the bus.
for (const bad of ['release_1', 'v2.ship', '2nd-review']) {
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.name.value=${JSON.stringify(bad)};f.requestSubmit()}true`);
assert.equal(await b.evaluate(`document.querySelector('[data-workflows-status]').textContent`), 'A workflow name is 1 to 64 lowercase letters, digits or dashes, starting with a letter.', bad);
assert.equal(sets(), before, `${bad} sends nothing`);
const before = sets().length;
await b.evaluate(`location.hash = '#/orgs/acme/workflows'`);
await waitFor(b, `document.querySelector('[data-wfg-new]')`, 'New workflow');
await press('[data-wfg-new]');
await waitFor(b, `document.querySelector('[data-wfg-newform] select[name=scope]')`, 'new form');
await b.evaluate(`{const f=document.querySelector('[data-wfg-newform]');f.elements.scope.value='site';f.elements.scope.dispatchEvent(new Event('change',{bubbles:true}))}true`);
await fill('[data-wfg-newform] input[name=title]', 'Plan');
await press('[data-wfg-newform] input[name="role"][value="human"]');
// The writer's name rule (PLAN_NAME): lowercase, no underscore, dot or leading digit. Each is refused here, not at the bus.
for (const bad of ['Bad Name', 'release_1', 'v2.ship', '2nd-review']) {
await fill('[data-wfg-newform] input[name=name]', bad);
await press('[data-wfg-create]');
await waitFor(b, `(document.querySelector('[data-wfg-newform] [data-wfg-why]')?.textContent ?? '') === 'A workflow name is 1 to 64 lowercase letters, digits or dashes, starting with a letter.'`, `${bad} refused`);
assert.equal(sets().length, before, `${bad} sends nothing`);
await fill('[data-wfg-newform] input[name=name]', '');
}
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] input[name=name]').placeholder`), 'lowercase letters, digits, dashes');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-newform] input[name=name]').placeholder`), 'lowercase letters, digits, dashes');
// A new workflow under a name the scope already holds would replace it: refused, nothing sent.
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.name.value='ship';f.requestSubmit()}true`);
assert.equal(await b.evaluate(`document.querySelector('[data-workflows-status]').textContent`), 'A workflow named ship already exists here. Edit it instead.');
assert.equal(sets(), before, 'an existing name sends nothing');
assert.equal(await b.evaluate(`document.querySelector('[data-wf-editor] select[name=scope]').value`), 'site', 'the editor keeps the chosen scope');
await b.evaluate(`{const f=document.querySelector('[data-wf-editor]');f.elements.name.value='plan';f.requestSubmit()}true`);
await waitFor(b, `document.querySelector('[data-workflows-status]').textContent==='Saved plan.'`, 'new save');
assert.deepEqual(verbs.filter(([v]) => v === 'workflow.set.console').at(-1)[1], { revision: REV('b'), name: 'plan', workflow: { steps: [{ title: 'Plan', state: 'todo', roles: ['human'] }] }, project: 'site' });
assert.ok(await b.evaluate(`document.querySelector('[data-wf-scope-list="site"] [data-wf="plan"]')!==null`));
await fill('[data-wfg-newform] input[name=name]', 'ship');
await press('[data-wfg-create]');
await waitFor(b, `(document.querySelector('[data-wfg-newform] [data-wfg-why]')?.textContent ?? '') === 'A workflow named ship already exists here. Edit it instead.'`, 'existing name refused');
assert.equal(sets().length, before, 'an existing name sends nothing');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-newform] select[name=scope]').value`), 'site', 'the form keeps the chosen scope');
await fill('[data-wfg-newform] input[name=name]', 'plan');
await press('[data-wfg-create]');
await waitFor(b, `location.hash === '#/orgs/acme/workflows/plan?project=site&step=1' && document.querySelector('[data-wfg-save]') && !document.querySelector('[data-wfg-save]').disabled`, 'opens unsaved');
assert.equal(sets().length, before, 'Create writes nothing');
await press('[data-wfg-save]');
await waitFor(b, `/Saved plan\\./.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'new save');
assert.deepEqual(sets().at(-1)[1], { revision: REV('b'), name: 'plan', project: 'site', workflow: { steps: [{ title: 'Plan', state: 'todo', roles: ['human'] }] } });
// Delete asks first; Keep sends nothing; Delete sends the project and the revision.
const del = `[data-wf-scope-list="site"] [data-wf="ship"]`;
await b.evaluate(`document.querySelector('${del} [data-wf-delete]').click();true`);
await waitFor(b, `document.querySelector('${del} [data-wf-delete-no]')`, 'delete confirm');
await b.evaluate(`document.querySelector('${del} [data-wf-delete-no]').click();true`);
await waitFor(b, `document.querySelector('${del} [data-wf-delete]')`, 'kept');
const n = sets();
await b.evaluate(`document.querySelector('${del} [data-wf-delete]').click();true`);
await waitFor(b, `document.querySelector('${del} [data-wf-delete-yes]')`, 'delete confirm again');
assert.equal(sets(), n);
await b.evaluate(`location.hash = '#/orgs/acme/workflows/ship?project=site'`);
await waitFor(b, `document.querySelector('[data-wfg-delete]') && document.querySelector('#bus-view h1')?.textContent === 'ship'`, 'ship graph');
await press('[data-wfg-delete]');
await waitFor(b, `document.querySelector('[data-wfg-delete-no]')`, 'delete confirm');
await press('[data-wfg-delete-no]');
await waitFor(b, `document.querySelector('[data-wfg-delete]') && !document.querySelector('[data-wfg-confirm]')`, 'kept');
const n = sets().length;
await press('[data-wfg-delete]');
await waitFor(b, `document.querySelector('[data-wfg-delete-yes]')`, 'delete confirm again');
assert.equal(sets().length, n);
const rev = flows().revision;
await b.evaluate(`document.querySelector('${del} [data-wf-delete-yes]').click();true`);
await waitFor(b, `document.querySelector('[data-workflows-status]').textContent==='Deleted ship.'`, 'delete status');
assert.deepEqual(verbs.filter(([v]) => v === 'workflow.set.console').at(-1)[1], { revision: rev, name: 'ship', workflow: null, project: 'site' });
assert.equal(await b.evaluate(`document.querySelector('${del}')`), null);
await press('[data-wfg-delete-yes]');
await waitFor(b, `location.hash === '#/orgs/acme/workflows' && /Deleted ship\\./.test(document.querySelector('[data-wfg-list] [data-wfg-status]')?.textContent ?? '')`, 'delete status');
assert.deepEqual(sets().at(-1)[1], { revision: rev, name: 'ship', workflow: null, project: 'site' });
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-scope-list="site"] [data-wfg-item="ship"]')`), null);
assert.equal(await b.evaluate(`document.documentElement.scrollWidth<=innerWidth`), true);
});
@@ -302,8 +302,8 @@ test('keyboard focus follows visual order and survives a data refresh', async t
await b.navigate(`http://127.0.0.1:${server.address().port}/#/orgs/ddigital/organization`);
await wait('document.querySelectorAll("[data-org-dashboard] .ws-doc").length > 0 && document.querySelectorAll("#workspace-nav .ws-proj").length === 3');
const wide = await tabStops(b, 'document.querySelector("#sections a")');
// The right column holds the Workflows card (SP9) above Settings.
const regions = ['nav', 'head', 'Measures and sessions', 'Workflows and settings'];
// The left column holds the sessions and, below them, the Workflows card (SP16); the right holds Settings.
const regions = ['nav', 'head', 'Sessions and workflows', 'Settings'];
assert.deepEqual([...new Set(wide.map(s => s.region))].filter(r => r !== 'other'), regions);
assertVisualOrder(wide.filter(s => s.region !== 'other'), regions, '1440');
const keys = wide.map(s => s.key);
+429 -99
View File
@@ -10,6 +10,10 @@ import test from 'node:test';
import assert from 'node:assert/strict';
import { startServer } from '../src/serve.mjs';
import { createDevOwner } from '../src/dev-owner.mjs';
import { mkdtempSync } from 'node:fs';
import { join } from 'node:path';
import { createOrgAdmin } from '../src/org-admin.mjs';
import { actionTrail } from '../src/action-trail.mjs';
import { browser } from './browser.mjs';
import { close } from './fixture.mjs';
@@ -45,11 +49,18 @@ const LIST = [
// page sent, and a refusal to give the next write. A write with another revision is a revision-conflict.
const hex = n => n.toString(16).padStart(64, '0');
function store(writable) {
const st = { writable, docs: structuredClone(DOCS), revs: { acme: 'a'.repeat(64), bare: 'b'.repeat(64), gamma: 'c'.repeat(64) }, writes: [], refuse: null, n: 0 };
const st = { writable, docs: structuredClone(DOCS), revs: { acme: 'a'.repeat(64), bare: 'b'.repeat(64), gamma: 'c'.repeat(64) }, writes: [], refuse: null, n: 0, held: {}, down: {} };
// SP17 item 4: st.down[id] is 'restarting' (the bus does not answer: the list says unavailable, the file
// still reads, a write finds no bus host) or 'stopped' (the owner stopped it: the page does not read it).
st.view = org => (st.down[org.id] ? { ...org, busHealthy: false, ...(st.down[org.id] === 'stopped' ? { busStopped: true } : {}) } : org);
// SP17: hold('read') holds the next workflow read, which answers with the file as it was when the read
// began; hold('write') holds the next write before it reaches the file. Each returns the release.
st.hold = which => { let open; st.held[which] = new Promise(r => { open = r; }); return open; };
const fail = code => Object.assign(new Error(code), { code });
st.write = (id, verb, args) => {
st.writes.push({ id, verb, args: structuredClone(args) });
if (verb !== 'workflow.set.console') throw fail('not-configured');
if (st.down[id]) throw fail('no-bus-host');
if (st.refuse) { const code = st.refuse; st.refuse = null; throw fail(code); }
if (args.revision !== st.revs[id]) throw fail('revision-conflict');
const doc = st.docs[id], scope = args.project ? doc.projects[args.project] : doc;
@@ -63,20 +74,26 @@ function store(writable) {
return st;
}
function organizations(reads, st) {
const member = org => ({
const member = org0 => { const org = st.view(org0); return {
id: org.id, doc: { appearance: { theme: org.theme }, roles: {}, projects: {} },
status: async () => (org.busHealthy ? { healthy: true, pid: 4242, boot: null } : { healthy: false, boot: { ok: false, at: at(90), lastGood: null, reason: 'stopped by the owner' } }),
options: () => ({ bus: { inbox: async () => [], agents: async () => [], 'thread.claims': async () => [], tasks: async () => [] }, chat: { threads: async () => [], projects: async () => [] } }),
});
}; };
return {
list: async () => LIST,
list: async () => LIST.map(st.view),
members: async () => LIST.map(member),
resolve: async id => {
const org = LIST.find(o => o.id === id); if (!org) return null;
const workflowsRead = async () => { reads.push(id); if (st.failRead) throw Object.assign(new Error('org-unavailable'), { code: 'org-unavailable' }); return { revision: st.revs[id], document: structuredClone(st.docs[id] ?? {}), templates: ['writer'] }; };
const workflowsRead = async () => {
reads.push(id);
if (st.failRead) throw Object.assign(new Error('org-unavailable'), { code: 'org-unavailable' });
const answer = { revision: st.revs[id], document: structuredClone(st.docs[id] ?? {}), templates: ['writer'] };
const h = st.held.read; if (h) { st.held.read = null; await h; }
return answer;
};
if (!org.busHealthy) return { busHealthy: false, reads: null, bus: {}, workflowsRead, chat: { projects: async () => [], threads: async () => [] } };
return {
busHealthy: true, workflowsRead, packsWrite: st.writable ? async (verb, args) => st.write(id, verb, args) : null, decisionWrite: async () => ({}), send: async () => ({}),
busHealthy: true, workflowsRead, packsWrite: st.writable ? async (verb, args) => { const h = st.held.write; if (h) { st.held.write = null; await h; } return st.write(id, verb, args); } : null, decisionWrite: async () => ({}), send: async () => ({}),
requestRead: async verb => { if (verb === 'packs.console') return { packs: [] }; if (verb === 'autonomy.get.console') return { revision: 'e'.repeat(64), autonomy: {}, levels: {} }; throw Object.assign(new Error('not-configured'), { code: 'not-configured' }); },
reads: { business: async () => ({ business: { id, projects: [], instances: [] } }), settings: async () => ({}), queue: async () => ({ rows: [] }) },
bus: { instances: async () => ({ instances: {} }), agents: async () => [], 'thread.claims': async () => [], tasks: async () => [], inbox: async () => [], messages: async () => ({ messages: [] }) },
@@ -86,9 +103,10 @@ function organizations(reads, st) {
};
}
async function setup(t, { path, viewport = [1440, 900], mode = null, writable = true } = {}) {
async function setup(t, { path, viewport = [1440, 900], mode = null, writable = true, admin = null } = {}) {
const reads = [], st = store(writable);
const server = await startServer({ port: 0, sso: createDevOwner(), send: async () => ({}), log: () => {}, organizations: organizations(reads, st) });
const extra = admin ? { orgAdmin: admin(st), trail: actionTrail(join(mkdtempSync(join(process.env.TMPDIR, 'wfg-')), 'console')) } : {};
const server = await startServer({ port: 0, sso: createDevOwner(), send: async () => ({}), log: () => {}, organizations: organizations(reads, st), ...extra });
t.after(() => close(server));
const b = await browser({ machine: false, args: ['--disable-extensions'] });
t.after(() => b.close());
@@ -157,7 +175,8 @@ test('the graph draws one box per step in order with its roles and one arrowed e
});
test('selecting a step shows what the data holds for it and survives a repaint', { timeout: 60000 }, async t => {
const { b, wait, reads } = await setup(t, { path: '#/orgs/acme/workflows/change' });
// A reader's page: the roles and state are lines of text. A writer's page shows them as the step's form (below).
const { b, wait, reads } = await setup(t, { path: '#/orgs/acme/workflows/change', writable: false });
await wait(`${boxes}.length === 4`, 'four boxes');
assert.match(await b.evaluate(`document.querySelector('[data-wfg-detail]').textContent`), /Select a step/);
await b.evaluate(`document.querySelector('[data-wfg-step="2"]').dispatchEvent(new MouseEvent('click',{bubbles:true,cancelable:true}));true`);
@@ -262,6 +281,15 @@ test('the organization page card lists each workflow as a link to its graph', {
assert.equal(await b.evaluate(`window.__sp9pwn===undefined`), true);
// The card reuses the page's one workflow read; it sends no second one.
assert.equal(reads.filter(id => id === 'acme').length, 1);
// SP17: under each workflow, each step links to its own form.
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-card] .wfg-cardlist > li:first-child [data-wfg-card-step]')].map(a=>[a.getAttribute('href'),a.textContent,a.getAttribute('aria-label')])`), [
['#/orgs/acme/workflows/change?step=1', 'Write the task', 'Change step 1, Write the task'],
['#/orgs/acme/workflows/change?step=2', 'Implement the change', 'Change step 2, Implement the change'],
['#/orgs/acme/workflows/change?step=3', 'Review the change', 'Change step 3, Review the change'],
['#/orgs/acme/workflows/change?step=4', 'Approve the merge', 'Change step 4, Approve the merge'],
]);
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-card] [data-wfg-card-step]')].map(a=>a.getAttribute('href')).filter(h=>/project=site/.test(h))`), ['#/orgs/acme/workflows/change?project=site&step=1', '#/orgs/acme/workflows/change?project=site&step=2']);
assert.equal(await b.evaluate(`document.documentElement.scrollWidth<=innerWidth`), true);
await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-card-item]').click();true`);
await wait(`location.hash === '#/orgs/acme/workflows/change' && document.querySelectorAll('[data-wfg-graph] [data-wfg-step]').length === 4`, 'graph from card');
});
@@ -325,31 +353,36 @@ const fill = (sel, value) => `(()=>{const e=document.querySelector(${JSON.string
const role = (form, name) => `${form} input[name="role"][value="${name}"]`;
const text = sel => `(document.querySelector(${JSON.stringify(sel)})?.textContent ?? '').replace(/\\s+/g,' ').trim()`;
test('editing a step changes the graph on the page, and Save sends one POST with the revision the page read', { timeout: 60000 }, async t => {
const form = '[data-wfg-step-form]';
const saveOn = `(()=>{const e=document.querySelector('[data-wfg-save]');return !!e&&!e.disabled})()`;
test('a selected step is its edit form: a change draws in the graph, and Save sends one POST with the revision the page read', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?step=4' });
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge' && document.querySelector('[data-wfg-edit]')`, 'step 4 with Edit');
// Nothing pending: no Unsaved, no Save.
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-unsaved],[data-wfg-save],[data-wfg-discard]')`), null);
await b.evaluate(press('[data-wfg-edit]'));
await wait(`document.querySelector('[data-wfg-form] [data-wfg-form-title]')?.textContent === 'Edit step 4'`, 'step form');
assert.equal(await b.evaluate(`document.activeElement.dataset.focusKey`), 'wfg-f-title');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] input[name="title"]').value`), 'Approve the merge');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] select[name="state"]').value`), 'done');
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge' && document.querySelector('${form}')`, 'step 4 with its form');
// Nothing pending: no Unsaved, no Discard, no Reset, and Save is there but off.
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-unsaved],[data-wfg-discard]')`), null);
assert.equal(await b.evaluate(`document.querySelector('${form} [data-wfg-save]').disabled`), true);
assert.equal(await b.evaluate(`document.querySelector('${form} [data-wfg-cancel]').hidden`), true);
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]').value`), 'Approve the merge');
assert.equal(await b.evaluate(`document.querySelector('${form} select[name="state"]').value`), 'done');
// The picker offers human, the organization's roles and the templates; the step's unknown role is first, checked and marked.
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-form] input[name="role"]')].map(i=>[i.value,i.checked])`), [['merge-gate', true], ['human', true], ['coder', false], ['pm', false], ['reviewer', false], ['writer', false]]);
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-form] [data-wfg-pick-missing]')`));
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Approve and merge'));
await b.evaluate(press(role('[data-wfg-form]', 'merge-gate')));
await b.evaluate(press(role('[data-wfg-form]', 'reviewer')));
await b.evaluate(press('[data-wfg-apply]'));
await wait(`${titles}[3] === 'Approve and merge' && document.querySelector('[data-wfg-unsaved]')`, 'pending change drawn');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('${form} input[name="role"]')].map(i=>[i.value,i.checked])`), [['merge-gate', true], ['human', true], ['coder', false], ['pm', false], ['reviewer', false], ['writer', false]]);
assert.ok(await b.evaluate(`!!document.querySelector('${form} [data-wfg-pick-missing]')`));
await b.evaluate(fill(`${form} input[name="title"]`, 'Approve and merge'));
await b.evaluate(press(role(form, 'merge-gate')));
await b.evaluate(press(role(form, 'reviewer')));
// The graph draws the step as typed; nothing is written yet.
await wait(`${titles}[3] === 'Approve and merge' && document.querySelector('[data-wfg-unsaved]') && ${saveOn}`, 'pending change drawn');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('[data-wfg-step="4"] [data-wfg-roles] tspan')].map(t=>t.textContent)`), ['human', 'reviewer']);
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-step="4"] [data-wfg-missing]')`), null);
assert.equal(await b.evaluate(text('[data-wfg-unsaved]')), 'Unsaved');
assert.equal(await b.evaluate(`document.activeElement.dataset.focusKey`), 'wfg-save');
assert.equal(st.writes.length, 0, 'Apply writes nothing');
assert.equal(await b.evaluate(`document.querySelector('${form} [data-wfg-cancel]').hidden`), false, 'Reset step shows once the step differs');
// The panel's Save is the only one; the bar does not repeat it.
assert.equal(await b.evaluate(`document.querySelectorAll('[data-wfg-save]').length`), 1);
assert.equal(st.writes.length, 0, 'typing writes nothing');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')}) && !document.querySelector('[data-wfg-unsaved]')`, 'saved');
assert.ok(await b.evaluate(`!!document.querySelector('${form} [data-wfg-status]')`), 'the status sits with the Save that was pressed');
assert.equal(st.writes.length, 1);
assert.deepEqual(st.writes[0], { id: 'acme', verb: 'workflow.set.console', args: { revision: REV_A, name: 'change', workflow: {
description: 'One change from task to merge.',
@@ -359,9 +392,29 @@ test('editing a step changes the graph on the page, and Save sends one POST with
{ title: 'Review the change', state: 'in-review', roles: ['reviewer'] },
{ title: 'Approve and merge', state: 'done', roles: ['human', 'reviewer'] },
] } } });
// The page now draws the file as saved, read again.
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve and merge'`, 'detail after save');
assert.deepEqual(st.docs.acme.workflows.change.steps[3], { title: 'Approve and merge', state: 'done', roles: ['human', 'reviewer'] });
// Reset step puts a typed step back as the page holds it.
await b.evaluate(fill(`${form} input[name="title"]`, 'Oops'));
await wait(`${titles}[3] === 'Oops'`, 'typed');
await b.evaluate(press(`${form} [data-wfg-cancel]`));
await wait(`document.querySelector('${form} input[name="title"]')?.value === 'Approve and merge' && ${titles}[3] === 'Approve and merge' && !document.querySelector('[data-wfg-unsaved]')`, 'reset');
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), false);
});
test('the workflow title and description change in the panel with no step selected, and save with the workflow', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site' });
await wait(`document.querySelector('[data-wfg-meta-form]')`, 'workflow form');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-meta-form] input[name="title"]').value`), 'Site release');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-meta-form] [data-wfg-save]').disabled`), true);
await b.evaluate(fill('[data-wfg-meta-form] input[name="title"]', 'Site launch'));
await b.evaluate(fill('[data-wfg-meta-form] textarea[name="description"]', 'From build to live.'));
await wait(`document.querySelector('[data-wfg-unsaved]') && ${saveOn}`, 'pending');
await b.evaluate(press('[data-wfg-meta-form] [data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.deepEqual(st.writes[0].args, { revision: REV_A, name: 'change', project: 'site', workflow: { title: 'Site launch', description: 'From build to live.', steps: [
{ title: 'Build', state: 'in-progress', roles: ['coder'] }, { title: 'Ship', state: 'done', roles: ['human'] }] } });
await wait(`document.querySelector('#bus-view h1')?.textContent === 'Site launch'`, 'heading after save');
});
test('add, move, remove and discard change only the page until Save', { timeout: 60000 }, async t => {
@@ -370,16 +423,16 @@ test('add, move, remove and discard change only the page until Save', { timeout:
// Add after the selected step.
await b.evaluate(press('[data-wfg-add]'));
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'New step 3'`, 'add form');
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Test the change'));
await b.evaluate(`(()=>{const e=document.querySelector('[data-wfg-form] select[name="state"]');e.value='in-review';e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
// Apply with no role is refused in words, and the form stays.
await b.evaluate(press('[data-wfg-apply]'));
await b.evaluate(fill('[data-wfg-add-form] input[name="title"]', 'Test the change'));
await b.evaluate(`(()=>{const e=document.querySelector('[data-wfg-add-form] select[name="state"]');e.value='in-review';e.dispatchEvent(new Event('input',{bubbles:true}));return true})()`);
// Add step with no role is refused in words, and the form stays.
await b.evaluate(press('[data-wfg-add-step]'));
await wait(`${text('[data-wfg-why]')} === 'Step 3 needs at least one role.'`, 'no role refused');
await b.evaluate(press(role('[data-wfg-form]', 'coder')));
await b.evaluate(press('[data-wfg-apply]'));
await b.evaluate(press(role('[data-wfg-add-form]', 'coder')));
await b.evaluate(press('[data-wfg-add-step]'));
await wait(`${boxes}.length === 5 && ${titles}[2] === 'Test the change'`, 'step added');
assert.equal(await b.evaluate(`location.hash`), '#/orgs/acme/workflows/change?step=3');
assert.equal(await b.evaluate(text('[data-wfg-field="state"]')), 'Review');
assert.equal(await b.evaluate(`document.querySelector('${form} select[name="state"]').value`), 'in-review');
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-unsaved]')`));
// Move earlier and later.
await b.evaluate(press('[data-wfg-up]'));
@@ -399,9 +452,9 @@ test('add, move, remove and discard change only the page until Save', { timeout:
await wait(`${text('[data-wfg-add]')} === 'Add a step at the end'`, 'add at end');
await b.evaluate(press('[data-wfg-add]'));
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'New step 5'`, 'add-at-end form');
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Announce it'));
await b.evaluate(press(role('[data-wfg-form]', 'pm')));
await b.evaluate(press('[data-wfg-apply]'));
await b.evaluate(fill('[data-wfg-add-form] input[name="title"]', 'Announce it'));
await b.evaluate(press(role('[data-wfg-add-form]', 'pm')));
await b.evaluate(press('[data-wfg-add-step]'));
await wait(`${boxes}.length === 5 && ${titles}[4] === 'Announce it' && /step=5/.test(location.hash)`, 'added at end');
// Discard drops all of it; nothing was written.
await b.evaluate(press('[data-wfg-discard]'));
@@ -412,24 +465,19 @@ test('add, move, remove and discard change only the page until Save', { timeout:
test('a refused save says why next to Save and keeps the pending change', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?step=1' });
await wait(`document.querySelector('[data-wfg-edit]')`, 'step 1');
await b.evaluate(press('[data-wfg-edit]'));
await wait(`document.querySelector('[data-wfg-form]')`, 'form');
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Write the brief'));
await b.evaluate(press('[data-wfg-apply]'));
await wait(`${titles}[0] === 'Write the brief'`, 'pending');
// Step 4 still names merge-gate: the page refuses before sending, in the same words as the form editor.
await wait(`document.querySelector('${form}')`, 'step 1');
await b.evaluate(fill(`${form} input[name="title"]`, 'Write the brief'));
await wait(`${titles}[0] === 'Write the brief' && ${saveOn}`, 'pending');
// Step 4 still names merge-gate: the page refuses before sending.
await b.evaluate(press('[data-wfg-save]'));
await wait(`${text('[data-wfg-status]')} === 'Step 4: merge-gate names no current role. Use an organization role, a role template or human.'`, 'unknown role refused');
assert.equal(st.writes.length, 0);
assert.ok(await b.evaluate(`${titles}[0] === 'Write the brief' && !!document.querySelector('[data-wfg-unsaved]')`));
// Fix step 4, then the bus is down.
await b.evaluate(pick(4));
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge'`, 'step 4');
await b.evaluate(press('[data-wfg-edit]'));
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'Edit step 4'`, 'form 4');
await b.evaluate(press(role('[data-wfg-form]', 'merge-gate')));
await b.evaluate(press('[data-wfg-apply]'));
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Approve the merge' && document.querySelector('${form}')`, 'step 4');
assert.equal(await b.evaluate(`${titles}[0]`), 'Write the brief', 'the step 1 edit went into the workflow');
await b.evaluate(press(role(form, 'merge-gate')));
await wait(`!document.querySelector('[data-wfg-step="4"] [data-wfg-missing]')`, 'step 4 fixed');
st.refuse = 'no-bus-host';
await b.evaluate(press('[data-wfg-save]'));
@@ -437,10 +485,11 @@ test('a refused save says why next to Save and keeps the pending change', { time
assert.match(await b.evaluate(text('[data-wfg-status]')), /Your change is kept/);
assert.equal(st.writes.length, 1);
assert.equal(st.writes[0].args.revision, REV_A);
assert.ok(await b.evaluate(`${titles}[0] === 'Write the brief' && !!document.querySelector('[data-wfg-unsaved]') && !!document.querySelector('[data-wfg-save]')`));
assert.deepEqual(st.writes[0].args.workflow.steps[3].roles, ['human']);
assert.ok(await b.evaluate(`${titles}[0] === 'Write the brief' && !!document.querySelector('[data-wfg-unsaved]') && ${saveOn}`));
assert.equal(st.docs.acme.workflows.change.steps[0].title, 'Write the task', 'nothing written');
// The status sits in the bar with Save.
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-bar] [data-wfg-status]') && !!document.querySelector('[data-wfg-bar] [data-wfg-save]')`));
// The status sits in the panel form with its Save.
assert.ok(await b.evaluate(`!!document.querySelector('${form} [data-wfg-status]') && !!document.querySelector('${form} [data-wfg-save]')`));
// Another writer changes this workflow: the save is refused as stale, the change kept.
st.change('acme', doc => { doc.workflows.change.description = 'Changed elsewhere.'; });
await b.evaluate(press('[data-wfg-save]'));
@@ -453,17 +502,14 @@ test('a refused save says why next to Save and keeps the pending change', { time
test('the poll does not draw over a pending change, takes a new revision when only other workflows changed, and says when this one changed', { timeout: 60000 }, async t => {
const { b, wait, st, reads } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
// The site project's workflow names only current roles, so a save goes to the bus.
await wait(`document.querySelector('[data-wfg-edit]')`, 'step 2');
await wait(`document.querySelector('${form}')`, 'step 2');
const repaint = async () => { const n = reads.length; await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`); await wait(`true`); for (let i = 0; i < 100 && reads.length === n; i++) await new Promise(r => setTimeout(r, 30)); await new Promise(r => setTimeout(r, 150)); };
// A form being typed in survives a repaint as typed.
await b.evaluate(press('[data-wfg-edit]'));
await wait(`document.querySelector('[data-wfg-form]')`, 'form');
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Ship the release'));
await repaint();
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] input[name="title"]')?.value`), 'Ship the release');
await b.evaluate(press('[data-wfg-apply]'));
await wait(`${titles}[1] === 'Ship the release' && document.querySelector('[data-wfg-unsaved]')`, 'pending');
// A form being typed in survives a repaint as typed, the same node.
await b.evaluate(fill(`${form} input[name="title"]`, 'Ship the release'));
await b.evaluate(`window.__form = document.querySelector('${form}'); true`);
await repaint();
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship the release');
assert.equal(await b.evaluate(`document.querySelector('${form}') === window.__form`), true);
assert.equal(await b.evaluate(`${titles}[1]`), 'Ship the release', 'the poll keeps the pending change');
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-unsaved]')`));
// Another workflow changes in the file: this one is as read, so the page takes the new revision and no warning shows.
@@ -471,32 +517,69 @@ test('the poll does not draw over a pending change, takes a new revision when on
const fresh = st.revs.acme;
await repaint();
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-stale]')`), null);
assert.equal(await b.evaluate(`${titles}[1]`), 'Ship the release');
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship the release');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved on the new revision');
assert.equal(st.writes.at(-1).args.revision, fresh);
assert.equal(st.docs.acme.workflows.intake.title, 'Intake, renamed', 'the other workflow is untouched');
// Now this workflow changes underneath a pending change: the page says so and offers Discard.
await b.evaluate(press('[data-wfg-edit]'));
await wait(`document.querySelector('[data-wfg-form]')`, 'form again');
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Build it'));
await b.evaluate(press('[data-wfg-apply]'));
await b.evaluate(fill(`${form} input[name="title"]`, 'Build it'));
await wait(`${titles}[1] === 'Build it'`, 'pending again');
st.change('acme', doc => { doc.projects.site.workflows.change.description = 'Changed elsewhere.'; });
// A change elsewhere to the step being typed in: the page says so instead of taking the file silently.
st.change('acme', doc => { const w = doc.projects.site.workflows.change; w.description = 'Changed elsewhere.'; w.steps[1].state = 'in-review'; });
await repaint();
await wait(`!!document.querySelector('[data-wfg-stale]')`, 'stale note');
assert.match(await b.evaluate(text('[data-wfg-stale]')), /changed this workflow since the page read it.*Discard to load the current version/);
assert.equal(await b.evaluate(`${titles}[1]`), 'Build it');
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Build it');
assert.ok(await b.evaluate(`!!document.querySelector('[data-wfg-discard]')`));
await b.evaluate(press('[data-wfg-discard]'));
await wait(`${titles}[1] === 'Ship the release' && !document.querySelector('[data-wfg-stale],[data-wfg-unsaved]')`, 'discarded to current');
assert.match(await b.evaluate(`document.querySelector('#bus-view .sub').textContent`), /Changed elsewhere\./);
});
// SP17: changes step `step`'s title on the open graph page, so the change is pending and Save is on.
async function retitle(b, wait, step, title) {
await wait(`document.querySelector('${form}')?.dataset.wfgStepForm === '${step - 1}'`, 'step form');
await b.evaluate(fill(`${form} input[name="title"]`, title));
await wait(`${titles}[${step - 1}] === ${JSON.stringify(title)} && ${saveOn}`, 'pending change');
}
test('SP17: a Save in flight holds the poll, and the page shows the saved workflow from the answer', { timeout: 60000 }, async t => {
const { b, wait, st, reads } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
await wait(`${boxes}.length === 2 && document.querySelector('[data-wfg-detail]')`, 'site graph');
await retitle(b, wait, 2, 'Ship the release');
// The write is held, so the Save is in flight.
const openWrite = st.hold('write');
await b.evaluate(press('[data-wfg-save]'));
await wait(`document.querySelector('[data-wfg-save]')?.disabled === true`, 'save in flight');
// A poll begins while the Save is in flight: its read takes the file as it was before the write.
const openRead = st.hold('read'), n = reads.length;
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
for (let i = 0; i < 200 && reads.length === n; i++) await new Promise(r => setTimeout(r, 20));
assert.ok(reads.length > n, 'the poll read began');
openWrite();
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
// The poll's read answers only now, with the file as it was before the Save.
openRead();
await new Promise(r => setTimeout(r, 800));
assert.deepEqual(await b.evaluate(titles), ['Build', 'Ship the release'], 'the step shows the saved title, not the read from before the Save');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-stale],[data-wfg-unsaved]')`), null);
assert.equal(st.writes.length, 1, 'one write');
// The page took the revision the write answered: the next Save is not refused as changed elsewhere.
const saved = st.revs.acme;
await retitle(b, wait, 2, 'Ship it');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')}) && !document.querySelector('[data-wfg-unsaved]')`, 'second save');
assert.equal(st.writes.length, 2);
assert.equal(st.writes[1].args.revision, saved);
assert.equal(st.docs.acme.projects.site.workflows.change.steps[1].title, 'Ship it');
});
test('a reader who cannot write sees no edit controls and one line saying who can', { timeout: 60000 }, async t => {
const { b, wait } = await setup(t, { path: '#/orgs/acme/workflows/change?step=2', writable: false });
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Implement the change'`, 'step 2');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-bar],[data-wfg-actions],[data-wfg-edit],[data-wfg-add],[data-wfg-save],[data-wfg-delete],[data-wfg-form]')`), null);
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-bar],[data-wfg-actions],[data-wfg-add],[data-wfg-save],[data-wfg-delete],[data-wfg-form],#bus-view input,#bus-view select,#bus-view textarea')`), null);
assert.equal(await b.evaluate(text('[data-wfg-field="roles"]')), 'coder', 'a reader sees the roles as text');
assert.deepEqual(await b.evaluate(`[...document.querySelectorAll('#bus-view [data-wfg-readonly]')].map(n=>n.textContent)`), ['Only the owner, on a Console started with send, can change workflows.']);
assert.equal(await b.evaluate(`document.querySelectorAll('#bus-view button').length`), 0);
await b.evaluate(`location.hash = '#/orgs/acme/workflows'`);
@@ -560,27 +643,39 @@ test('the keyboard alone opens a step, edits it and saves', { timeout: 60000 },
await b.key('Enter');
await wait(`document.querySelector('[data-wfg-detail-title]')?.textContent === 'Build' && document.activeElement?.dataset.focusKey === 'wfg-step:1'`, 'Enter opens step 1');
const tabTo = async (sel, what) => {
for (let i = 0; i < 20; i++) { if (await b.evaluate(`document.activeElement?.matches(${JSON.stringify(sel)}) ?? false`)) return; await b.key('Tab'); }
for (let i = 0; i < 30; i++) { if (await b.evaluate(`document.activeElement?.matches(${JSON.stringify(sel)}) ?? false`)) return; await b.key('Tab'); }
throw new Error(`Tab never reached ${what}`);
};
await tabTo('[data-wfg-edit]', 'Edit step');
await b.key('Enter');
await wait(`document.querySelector('[data-wfg-form-title]')?.textContent === 'Edit step 1' && document.activeElement?.dataset.focusKey === 'wfg-f-title'`, 'form with focus on the title');
await tabTo(`${form} input[name="title"]`, 'the step title');
// Tab selects the field's text; the right arrow puts the caret after it (the harness sends no End key).
await b.key('ArrowRight');
await b.call('Input.insertText', { text: ' now' });
await tabTo(`[data-wfg-form] input[name="role"][value="reviewer"]`, 'the reviewer box');
await tabTo(`${form} input[name="role"][value="reviewer"]`, 'the reviewer box');
await b.key(' ', 'Space');
await tabTo('[data-wfg-apply]', 'Apply');
await b.key('Enter');
await wait(`${titles}[0] === 'Build now' && document.activeElement?.dataset.focusKey === 'wfg-save'`, 'applied, focus on Save');
await tabTo(`${form} [data-wfg-save]`, 'Save');
await wait(`${titles}[0] === 'Build now'`, 'typed into the graph');
await b.key('Enter');
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.deepEqual(st.writes[0].args, { revision: REV_A, name: 'change', project: 'site', workflow: { title: 'Site release', steps: [
{ title: 'Build now', state: 'in-progress', roles: ['coder', 'reviewer'] }, { title: 'Ship', state: 'done', roles: ['human'] }] } });
// Enter in the title field is Save too, and Escape resets a typed step.
await wait(`document.querySelector('${form} input[name="title"]')?.value === 'Build now'`, 'form after save');
await b.evaluate(`(()=>{const e=document.querySelector('${form} input[name="title"]');e.focus();e.setSelectionRange(e.value.length,e.value.length);return true})()`);
await b.call('Input.insertText', { text: '!' });
await wait(`${titles}[0] === 'Build now!'`, 'typed');
await b.key('Escape');
await wait(`document.querySelector('${form} input[name="title"]')?.value === 'Build now' && !document.querySelector('[data-wfg-unsaved]')`, 'Escape reset the step');
await b.evaluate(`(()=>{const e=document.querySelector('${form} input[name="title"]');e.focus();e.setSelectionRange(e.value.length,e.value.length);return true})()`);
await b.call('Input.insertText', { text: ', fast' });
await b.key('Enter');
await wait(`${titles}[0] === 'Build now, fast' && !document.querySelector('[data-wfg-unsaved]')`, 'saved by Enter');
assert.equal(st.writes.length, 2);
assert.equal(st.writes[1].args.workflow.steps[0].title, 'Build now, fast');
});
test('switching organization with a pending workflow change asks first, through the existing draft guard', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
await wait(`document.querySelector('[data-wfg-edit]') && document.querySelector('#breadcrumbs [data-crumb-org]')`, 'step 1');
await wait(`document.querySelector('${form}') && document.querySelector('#breadcrumbs [data-crumb-org]')`, 'step 1');
await b.evaluate(press('[data-wfg-remove]'));
await wait(`${boxes}.length === 1 && document.querySelector('[data-wfg-unsaved]')`, 'pending removal');
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
@@ -596,27 +691,42 @@ test('switching organization with a pending workflow change asks first, through
assert.equal(st.writes.length, 0);
});
test('Save with a step form holding edits not applied refuses in words and sends nothing; after Apply it sends them', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
await wait(`document.querySelector('[data-wfg-up]')`, 'step 2');
// One change pending, so Save shows; then a step form is opened and typed in, not applied.
await b.evaluate(press('[data-wfg-up]'));
await wait(`${titles}[0] === 'Ship' && document.querySelector('[data-wfg-save]')`, 'moved');
await b.evaluate(press('[data-wfg-edit]'));
await wait(`document.querySelector('[data-wfg-form]')`, 'form');
await b.evaluate(fill('[data-wfg-form] input[name="title"]', 'Ship the release'));
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Apply or cancel the step first/.test(${text('[data-wfg-status]')})`, 'save refused');
assert.equal(await b.evaluate(text('[data-wfg-status]')), 'Not saved: step 1 has edits not applied. Apply or cancel the step first.');
test('a typed step alone counts as a pending change for the switch guard', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
await wait(`document.querySelector('${form}') && document.querySelector('#breadcrumbs [data-crumb-org]')`, 'step 1');
await b.evaluate(fill(`${form} input[name="title"]`, 'Build it'));
await wait(`window.MosaicWorkflows.hasDraft()`, 'typed is a draft');
await b.evaluate(`location.hash = '#/orgs/bare/workflows'`);
await wait(`document.querySelector('dialog[aria-label="Unsaved draft"][open]')`, 'guard dialog');
await b.evaluate(press('dialog [data-stay]'));
await wait(`!document.querySelector('dialog[open]') && document.querySelector('${form} input[name="title"]')?.value === 'Build it'`, 'stayed with the typed title');
assert.equal(st.writes.length, 0);
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-form] input[name="title"]')?.value`), 'Ship the release', 'the typed title stays');
await b.evaluate(press('[data-wfg-apply]'));
await wait(`${titles}[0] === 'Ship the release'`, 'applied');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-status]')`), null, 'Apply clears the refusal');
});
test('a step edit goes into the workflow when another step is opened or a step moves, and Save sends it; one the save check refuses stays in its form', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
await wait(`document.querySelector('[data-wfg-up]') && document.querySelector('${form}')`, 'step 2');
// A typed title, then Move earlier: the step moves with its new title.
await b.evaluate(fill(`${form} input[name="title"]`, 'Ship the release'));
await b.evaluate(press('[data-wfg-up]'));
await wait(`${titles}[0] === 'Ship the release' && /step=1/.test(location.hash) && ${saveOn}`, 'moved with the edit');
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]').value`), 'Ship the release');
// An edit the save check refuses (no role left) stays: opening another step does not happen, and the form says why.
await b.evaluate(press(role(form, 'human')));
await b.evaluate(pick(2));
await wait(`${text('[data-wfg-why]')} === 'Step 1 needs at least one role.'`, 'refused in the form');
assert.match(await b.evaluate(`location.hash`), /step=1/);
assert.equal(await b.evaluate(`document.activeElement?.dataset.focusKey`), 'wfg-f-title');
// Save says the same and sends nothing.
await b.evaluate(press('[data-wfg-save]'));
await wait(`${text('[data-wfg-status]')} === 'Not saved: Step 1 needs at least one role.'`, 'save refused');
assert.equal(st.writes.length, 0);
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship the release', 'the typed title stays');
await b.evaluate(press(role(form, 'coder')));
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.equal(st.writes.length, 1);
assert.deepEqual(st.writes[0].args.workflow.steps.map(s => s.title), ['Ship the release', 'Build']);
assert.deepEqual(st.writes[0].args.workflow.steps, [{ title: 'Ship the release', state: 'done', roles: ['coder'] }, { title: 'Build', state: 'in-progress', roles: ['coder'] }]);
});
test('Delete on a view another writer has changed is refused, not deleted over', { timeout: 60000 }, async t => {
@@ -624,7 +734,8 @@ test('Delete on a view another writer has changed is refused, not deleted over',
await wait(`document.querySelector('[data-wfg-remove]')`, 'step 1');
await b.evaluate(press('[data-wfg-remove]'));
await wait(`${boxes}.length === 1 && document.querySelector('[data-wfg-unsaved]')`, 'pending removal');
st.change('acme', doc => { doc.projects.site.workflows.change.description = 'Changed elsewhere.'; });
// A change elsewhere to the step being typed in: the page says so instead of taking the file silently.
st.change('acme', doc => { const w = doc.projects.site.workflows.change; w.description = 'Changed elsewhere.'; w.steps[1].state = 'in-review'; });
const n = reads.length;
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
await wait(`!!document.querySelector('[data-wfg-stale]')`, 'stale note');
@@ -660,10 +771,229 @@ test('a failed read says a pending change is kept, and it comes back when the re
st.failRead = true;
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
await wait(`!!document.querySelector('[data-wfg-error]') && !!document.querySelector('[data-wfg-held]')`, 'error with kept note');
assert.equal(await b.evaluate(text('[data-wfg-held]')), 'Unsaved change to change is kept on this page. It comes back when the workflows can be read.');
// SP17: the page keeps drawing the last read with the change on it, and says the read failed.
assert.equal(await b.evaluate(text('[data-wfg-error]')), 'The last workflows read failed: The organization file could not be read. The page shows the read before it.');
assert.equal(await b.evaluate(text('[data-wfg-held]')), 'Unsaved change to change is kept on this page.');
assert.equal(await b.evaluate(`${boxes}.length`), 1, 'the pending removal is still drawn');
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
st.failRead = false;
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
await wait(`${boxes}.length === 1 && !!document.querySelector('[data-wfg-unsaved]') && !document.querySelector('[data-wfg-held]')`, 'back');
await wait(`${boxes}.length === 1 && !!document.querySelector('[data-wfg-unsaved]') && !document.querySelector('[data-wfg-held],[data-wfg-error]')`, 'back');
assert.equal(st.writes.length, 0);
});
// SP17 item 1: changing one field of one step of a saved workflow and saving it, from another organization's
// page: the organization in the sidebar, the step on its Workflows card, Save. Typing is not a click. Each
// click is a real pointer press at the element's centre, counted by the page. At 390 the sidebar sits behind
// the menu button, which is one more click; from the organization's own page it is two clicks at any width.
test('SP17: one field of one step changes and saves in three clicks', { timeout: 90000 }, async t => {
const cases = [
{ name: '1440 from another organization', viewport: [1440, 900], from: 'bare', want: [/Acme Studio/, 'Ship', 'Save'] },
{ name: '390 from another organization', viewport: [390, 844], from: 'bare', want: ['Open menu', /Acme Studio/, 'Ship', 'Save'] },
{ name: '390 from the organization page', viewport: [390, 844], from: 'acme', want: ['Ship', 'Save'] },
];
for (const c of cases) {
await t.test(c.name, async t2 => {
const { b, wait, st } = await setup(t2, { path: `#/orgs/${c.from}/organization`, viewport: c.viewport });
await wait(`document.querySelector('[data-org-dashboard] [data-wfg-card]')`, 'organization page');
await b.evaluate(`window.__clicks = []; addEventListener('click', e => { if (e.isTrusted) { const a = e.target.closest('a,button'); __clicks.push(a?.getAttribute('aria-label') === 'Open menu' ? 'Open menu' : a?.textContent.trim() ?? e.target.tagName); } }, true); true`);
const click = async (sel, what) => {
await wait(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});return !!e && !e.disabled && e.getClientRects().length>0})()`, what);
const { x, y } = await b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)});e.scrollIntoView({block:'center'});const r=e.getBoundingClientRect();return {x:r.left+r.width/2,y:r.top+r.height/2}})()`);
// What is under the pointer is the element meant, not something drawn over it.
assert.ok(await b.evaluate(`(()=>{const e=document.querySelector(${JSON.stringify(sel)}),h=document.elementFromPoint(${x},${y});return !!h&&(e===h||e.contains(h))})()`), `${what} is under the pointer`);
for (const type of ['mousePressed', 'mouseReleased']) await b.call('Input.dispatchMouseEvent', { type, x, y, button: 'left', clickCount: 1 });
};
if (c.from !== 'acme') {
if (c.viewport[0] === 390) {
await click('#nav-open', 'the menu button');
await wait(`document.body.classList.contains('nav-open')`, 'menu open');
await new Promise(r => setTimeout(r, 400));
}
await click('[data-workspace-org="acme"] a', 'Acme in the sidebar');
await wait(`location.hash === '#/orgs/acme/organization' && document.querySelector('[data-org-dashboard] [data-wfg-card] [data-wfg-card-step]') && !document.body.classList.contains('nav-open')`, 'acme page with its card');
await new Promise(r => setTimeout(r, 400));
}
await click('[data-wfg-card] [data-wfg-card-step][href="#/orgs/acme/workflows/change?project=site&step=2"]', 'step 2 on the card');
// The step's title field has focus, the caret at the end, ready to type.
await wait(`document.activeElement?.matches('[data-wfg-step-form] input[name="title"]') && document.activeElement.value === 'Ship'`, 'focus in the title');
assert.equal(await b.evaluate(`document.activeElement.selectionStart`), 4);
// The title and Save are both on screen without a scroll (SP17 shots: at 390 Save was below the fold).
const inView = sel => `(()=>{const r=document.querySelector(${JSON.stringify(sel)}).getBoundingClientRect();return r.top>=0&&r.bottom<=innerHeight})()`;
assert.equal(await b.evaluate(inView('[data-wfg-step-form] input[name="title"]')), true, 'title in view');
assert.equal(await b.evaluate(inView('[data-wfg-step-form] [data-wfg-save]')), true, 'Save in view');
assert.match(await b.evaluate(`document.getElementById('announce')?.textContent ?? ''`), /Step 2, Ship\. Change it and press Save\./);
await b.call('Input.insertText', { text: ' the release' });
await click('[data-wfg-step-form] [data-wfg-save]', 'Save');
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')}) && !document.querySelector('[data-wfg-unsaved]')`, 'saved');
// Focus stays in the step's title, and the line saying it saved is on screen.
await wait(`document.activeElement?.dataset.focusKey === 'wfg-f-title'`, 'focus kept in the form');
assert.equal(await b.evaluate(inView('[data-wfg-step-form] [data-wfg-status]')), true, 'Saved line in view');
const clicks = await b.evaluate(`__clicks`);
assert.equal(clicks.length, c.want.length, `${c.want.length} clicks: ${JSON.stringify(clicks)}`);
c.want.forEach((w, i) => (w instanceof RegExp ? assert.match(clicks[i], w) : assert.equal(clicks[i], w)));
assert.equal(st.writes.length, 1);
assert.deepEqual(st.writes[0].args, { revision: REV_A, name: 'change', project: 'site', workflow: { title: 'Site release', steps: [
{ title: 'Build', state: 'in-progress', roles: ['coder'] }, { title: 'Ship the release', state: 'done', roles: ['human'] }] } });
});
}
});
// SP17 item 4: an edit open when the organization's bus restarts is not lost without a word. The list is
// read again (as the bus banner and Restart bus do) and the page drawn again (as the poll does).
const relist = `(async()=>{await window.MosaicOrg.refreshList();document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));return true})()`;
const heldLinks = `[...document.querySelectorAll('[data-wfg-card] [data-wfg-held] [data-wfg-held-link]')].map(a=>[a.getAttribute('href'),a.textContent])`;
test('SP17: a step edit open while the bus restarts, then stops, is kept and named, and saves when the bus is back', { timeout: 90000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
await retitle(b, wait, 2, 'Ship it');
// Restarting: the bus does not answer, the file still reads. The form stays as typed; Save says why it did not save.
st.down.acme = 'restarting';
await b.evaluate(relist);
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),300))`);
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship it');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/the organization bus is not running/.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'no bus host');
assert.match(await b.evaluate(`document.body.innerText`), /Your change is kept/);
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]')?.value`), 'Ship it');
// Stopped: the page does not read the organization. It says the change is kept, on this page and on the
// organization's card, which links back to it.
st.down.acme = 'stopped';
await b.evaluate(relist);
await wait(`!document.querySelector('${form}') && !!document.querySelector('[data-wfg-held]')`, 'kept note while stopped');
assert.equal(await b.evaluate(text('[data-wfg-held]')), 'Unsaved change to change is kept on this page. It comes back when the workflows can be read.');
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
await wait(`!!document.querySelector('[data-wfg-card][data-bus-stopped] [data-wfg-held]')`, 'card kept note while stopped');
assert.deepEqual(await b.evaluate(heldLinks), [['#/orgs/acme/workflows/change?project=site', 'change (project site)']]);
// Back: the card still names it; its link opens the graph with the step as typed, and Save writes it.
delete st.down.acme;
await b.evaluate(relist);
await wait(`!document.querySelector('[data-wfg-card][data-bus-stopped]') && !!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'card back with kept note');
await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-held-link]').click();true`);
await wait(`location.hash === '#/orgs/acme/workflows/change?project=site' && ${titles}[1] === 'Ship it' && ${saveOn}`, 'kept change drawn');
const before = st.writes.length;
await b.evaluate(press('[data-wfg-save]'));
await wait(`!document.querySelector('[data-wfg-unsaved]') && !${saveOn}`, 'saved');
assert.equal(st.writes.length, before + 1);
assert.equal(st.writes.at(-1).args.revision, REV_A);
assert.equal(st.writes.at(-1).args.workflow.steps[1].title, 'Ship it');
assert.equal(st.docs.acme.projects.site.workflows.change.steps[1].title, 'Ship it');
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), false);
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
await wait(`!!document.querySelector('[data-wfg-card] [data-wfg-card-item]')`, 'card');
assert.equal(await b.evaluate(`!!document.querySelector('[data-wfg-card] [data-wfg-held]')`), false, 'nothing is held once saved');
});
test('SP17: Restart bus on the organization page with a step edit open keeps it, names it on the card, and it saves after', { timeout: 90000 }, async t => {
const restarts = [];
const admin = st => createOrgAdmin({
service: { showOrg: async (ctx, id) => ({ id, revision: 1, doc: {} }) }, registry: { listOrgs: async () => [] }, context: async () => ({ configDir: '/cfg', dataRoot: '/data', instance: 'test' }),
bus: {
busStatus: async (ctx, id) => ({ org: id, healthy: !st.down[id], pid: st.down[id] ? null : 4242 }),
// The restart takes the bus down, and it comes back before the answer, as a real restart does.
busRestart: async (ctx, id) => { restarts.push(id); st.down[id] = 'restarting'; await new Promise(r => setTimeout(r, 200)); delete st.down[id]; return { org: id, pid: 4343, socket: '/data/s', root: `/data/org-runtime/${id}` }; },
busStart: async () => { throw Error('not reached: the bus runs'); },
},
});
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2', admin });
await retitle(b, wait, 2, 'Ship it');
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
await wait(`!!document.querySelector('[data-org-dashboard] [data-bus-restart]') && !!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'restart button and kept note');
assert.deepEqual(await b.evaluate(heldLinks), [['#/orgs/acme/workflows/change?project=site', 'change (project site)']]);
await b.evaluate(press('[data-org-dashboard] [data-bus-restart]'));
await wait(`/It answers/.test(document.querySelector('[data-org-dashboard] [data-bus-restart-receipt]')?.textContent || '')`, 'restart receipt');
assert.deepEqual(restarts, ['acme']);
await b.evaluate(relist);
await wait(`!!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'kept note after the restart');
assert.deepEqual(await b.evaluate(heldLinks), [['#/orgs/acme/workflows/change?project=site', 'change (project site)']]);
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
await b.evaluate(`document.querySelector('[data-wfg-card] [data-wfg-held-link]').click();true`);
await wait(`location.hash === '#/orgs/acme/workflows/change?project=site' && ${titles}[1] === 'Ship it' && ${saveOn}`, 'kept change drawn');
await b.evaluate(press('[data-wfg-save]'));
await wait(`!document.querySelector('[data-wfg-unsaved]') && !${saveOn}`, 'saved');
assert.equal(st.writes.length, 1);
assert.equal(st.writes[0].args.revision, REV_A);
assert.equal(st.docs.acme.projects.site.workflows.change.steps[1].title, 'Ship it');
});
// SP17 review P2-1: an open edit of one step is not dropped when another step is opened from the card or the
// address and typed in. Both edits go in the one Save.
test('SP17: an edit of step 1 is kept when step 2 is opened from the card or the address and changed, and Save sends both', { timeout: 90000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
await retitle(b, wait, 1, 'Build it');
// From the card: the card says the change is kept; its step link opens step 2.
await b.evaluate(`location.hash = '#/orgs/acme/organization';true`);
await wait(`!!document.querySelector('[data-wfg-card] [data-wfg-held-link]')`, 'card kept note');
await b.evaluate(`document.querySelector('[data-wfg-card] a[data-wfg-card-step][href="#/orgs/acme/workflows/change?project=site&step=2"]').click();true`);
await wait(`document.querySelector('${form}')?.dataset.wfgStepForm === '1'`, 'step 2 form');
assert.deepEqual(await b.evaluate(titles), ['Build it', 'Ship']);
await retitle(b, wait, 2, 'Ship it');
assert.deepEqual(await b.evaluate(titles), ['Build it', 'Ship it'], 'typing in step 2 keeps step 1 as changed');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => s.title), ['Build it', 'Ship it']);
// From the address: step 1 changed, then the address names step 2.
await b.evaluate(`location.hash = '#/orgs/acme/workflows/change?project=site&step=1';true`);
await retitle(b, wait, 1, 'Build again');
await b.evaluate(`location.hash = '#/orgs/acme/workflows/change?project=site&step=2';true`);
await wait(`document.querySelector('${form}')?.dataset.wfgStepForm === '1'`, 'step 2 form from the address');
await retitle(b, wait, 2, 'Ship again');
assert.deepEqual(await b.evaluate(titles), ['Build again', 'Ship again']);
// Reset step on step 2 puts back step 2 only.
await b.evaluate(press('[data-wfg-cancel]'));
await wait(`${titles}[1] === 'Ship it'`, 'step 2 reset');
assert.deepEqual(await b.evaluate(titles), ['Build again', 'Ship it'], 'Reset step on step 2 leaves step 1 changed');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'second save');
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => s.title), ['Build again', 'Ship it']);
});
// SP17 review P2-2: nothing typed while a Save is in flight is dropped: the form's fields take no typing until
// the write answers.
test('SP17: while a Save is in flight the form takes no typing, and takes it again after', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=2' });
await retitle(b, wait, 2, 'Ship it');
const fields = `[...document.querySelectorAll('${form} input[name="title"], ${form} select, ${form} [data-wfg-roles-pick]')].map(e=>e.disabled)`;
const openWrite = st.hold('write');
await b.evaluate(press('[data-wfg-save]'));
await wait(`document.querySelector('[data-wfg-save]')?.disabled === true`, 'save in flight');
assert.deepEqual(await b.evaluate(fields), [true, true, true], 'title, state and roles are off while saving');
// A poll redraw during the write keeps them off.
await b.evaluate(`document.dispatchEvent(new CustomEvent('mosaic-workspace-render'));true`);
await b.evaluate(`new Promise(r=>setTimeout(()=>r(true),300))`);
assert.deepEqual(await b.evaluate(fields), [true, true, true], 'still off after a redraw');
openWrite();
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.deepEqual(await b.evaluate(fields), [false, false, false], 'on again once saved');
assert.equal(st.writes.at(-1).args.workflow.steps[1].title, 'Ship it');
// A refused Save gives the fields back too.
await retitle(b, wait, 2, 'Ship again');
st.down.acme = 'restarting';
await b.evaluate(press('[data-wfg-save]'));
await wait(`/the organization bus is not running/.test(document.querySelector('[data-wfg-status]')?.textContent ?? '')`, 'refused');
assert.deepEqual(await b.evaluate(fields), [false, false, false], 'on again after a refusal');
assert.equal(await b.evaluate(`document.querySelector('${form} input[name="title"]').value`), 'Ship again');
});
// SP17 review 2 P2-1: a new step typed in the add form is not dropped by the bar's Save: Save says it is not
// added yet and keeps the form; once added, Save sends it.
test('SP17: the bar Save with a new step typed in the add form says so and keeps it, and saves it once added', { timeout: 60000 }, async t => {
const { b, wait, st } = await setup(t, { path: '#/orgs/acme/workflows/change?project=site&step=1' });
await retitle(b, wait, 1, 'Build it');
await b.evaluate(press('[data-wfg-add]'));
await wait(`!!document.querySelector('[data-wfg-add-form]')`, 'add form');
await b.evaluate(fill('[data-wfg-add-form] input[name="title"]', 'Check'));
await b.evaluate(`document.querySelector('[data-wfg-add-form] input[name="role"][value="human"]').click();true`);
await b.evaluate(press('[data-wfg-bar] [data-wfg-save]'));
await wait(`/new step 2 is not added yet/.test(${text('[data-wfg-bar] [data-wfg-status]')})`, 'refused in words');
assert.equal(st.writes.length, 0, 'nothing written');
assert.equal(await b.evaluate(`document.querySelector('[data-wfg-add-form] input[name="title"]')?.value`), 'Check', 'the typed step is kept');
assert.equal(await b.evaluate(`document.activeElement === document.querySelector('[data-wfg-add-form] input[name="title"]')`), true, 'focus in the new step');
assert.equal(await b.evaluate(`window.MosaicWorkflows.hasDraft()`), true);
await b.evaluate(press('[data-wfg-add-step]'));
await wait(`${titles}.length === 3`, 'step added');
await b.evaluate(press('[data-wfg-save]'));
await wait(`/Saved change\\./.test(${text('[data-wfg-status]')})`, 'saved');
assert.deepEqual(st.writes.at(-1).args.workflow.steps.map(s => [s.title, s.roles]), [['Build it', ['coder']], ['Check', ['human']], ['Ship', ['human']]]);
});