* feat(annotations): image tagging controller with staged suggestions Add the UI-agnostic Tag image dialog controller (#249 C1): observe the file into a capture, prefill the saved tags and the server's tagging defaults, stage the top suggestions as removable chips, and save manual tags plus the remaining chips with case-insensitive dedupe (manual spelling first). Every read is serial-guarded; saves are sent once and a lost answer is resent identically only by Retry. Conflict, storage, file and capture outcomes keep the draft and gate Save on a reopen. ApiError now carries a validated copy of a tag-conflict body's current tag set so the dialog can show it. * feat(annotations): Tag image dialog beside Info on every image card Every Images and Library-embedded gallery card shows the concept's Tag after Info. Tag opens the concept's Tag image dialog (image-tagging.mjs over the C1 controller) in the shared modal shell with the sticky tagging-modal footer: capture preview, manual tags, the four legacy engines with real defaults, explicit Generate, removable suggestion chips (D83), legacy model labels (D84), a Suggestions count (D91) and Retry where the controller allows it. The capture is released on close, route change and pagehide. The Tags page gains the concept's Auto-tag images for the image selected in Images (aria-disabled without one, D115) and real Images counts that follow every save. Retires D9, #245 D2 and #245 D3. The toast now uses the mock's copy verbatim ("tags" even for one), C1's D60/D61/D68 markers are renumbered to D83/D84/D91, and at extreme zoom a card's info row stacks (and wraps Info and Tag) when its row is narrower than the narrowest bounded card, list rows included (D31). * feat(annotations): show image tags in the inspector and viewer The inspector parses the B3 envelope's image_tags facet (strictly: exact keys, current/none/unavailable, at most 100 vocabulary names) and draws one chip row after the prompt blocks: the file's current image tags first, then D21's linked tags not already shown (case-insensitive). In the Images panel image tags are Tags filter buttons and linked tags keep D21's rule; in the viewer and wherever no Tags filter exists every chip is plain. none and unavailable add no chips (D88, plan D65; D21 amended). The tagging fixture reset now drops leftover captures, so a long run of tagging tests in one worker stays below the capture store's limit. * fix(annotations): re-read a tagged file in place after a save After a tag save the selected file's inspection is re-read quietly: the panel and the viewer keep the current details until the new answer lands, with no "Loading file details…" in between. While a Tags filter or a search is active, Images re-reads its loaded range in place (same query, from the first page up to the loaded count, published once), keeping the cards, the scroll position and the selection while the selected file still matches; when it no longer matches, the panel follows the collection. * fix(annotations): give suggestion chips the concept chip corner The D83 chips took the later `.tag-suggestion` row rule's 5px corner; the concept `.chip` has 4px. The concept comparison of the Tag dialog found it. * test(annotations): compare the Tag dialog with the approved concept The Tag image dialog's inventory (order, text, field attributes, tokens, preview box, chips, status, sticky actions) must equal the concept's at 1600x1100 and 390x844, dark and light, opened, generated with WD14 and with a language model, for an empty result and in the review scope, and the card's Info and Tag group must equal the concept's. Production runs on the concept fixture with the concept image's tags saved and the fake model answering the concept's own sample; only D29, D83, D84 and D91 are mapped, and a mutation check shows the comparison notices a change. The D3 footer check again asserts a strictly shorter footer, with short seedless subtitles that stay on one line beside Info and Tag. * fix(annotations): final review round for the Tag image dialog - Option fields show the server defaults that Generate sends: the controller bumps an options revision on open and on a model change, and the panel re-renders only then (I1). - A tag conflict shows the current set at once ("Saved now: ...") and puts it ahead of the draft in the manual field, so the next Save sends what is shown (I2). - The opening sentence is the concept's on-screen copy; "Remove anything you do not want to add." leads the chips only while chips exist; the comparison's opened mapping is gone (I3). - ApiClient gains an additive keepalive option; the capture release and the Save PUT use it, and pagehide closes the dialog (I4). - Closing during a save keeps the capture until the PUT settles, then releases it and still reports the outcome (toast, page refresh) (I5). - A refresh asked during a page load is pending and runs once it settles; re-reads use pages up to 200 files; a failed re-read toasts; Load more waits for a refresh (I6, M2, M3). - The selection bar drops checked files a refreshed result no longer lists (I7). - D116 records Retry; after a failed Generate it takes Generate's own path, and after a changed storage, file or expired capture it observes again keeping the draft (I9, M4, M5). - A save made from Tags marks a filtered Images visit stale (M6). - images.mjs drops under 800 lines: the tagging wiring moves to images-tagging.mjs and the favorites star to images-favorites.mjs (unchanged), and reset() reuses dropSelection() (M1). - Restore the activity-scan.mjs coverage floors; drop the duplicate paired captures test (I8, M9). * fix(annotations): coverage floors for the Tag dialog round Floors for the new images-favorites.mjs and images-tagging.mjs, and the measured raises of image-tagging-state.mjs and image-tagging.mjs. activity-scan.mjs keeps main's floors.
217 lines
16 KiB
JavaScript
217 lines
16 KiB
JavaScript
import { writeFile } from 'node:fs/promises';
|
||
import { expect } from './fixtures.mjs';
|
||
|
||
// Content, row counts, and image bytes come from independent synthetic datasets.
|
||
// Saved choices and actual executions are separate production sections. The concept's
|
||
// illustrative repeat dialog is compared with Recorded run for native behavior;
|
||
// frozen evidence and current-file/unknown copy intentionally describe actual data.
|
||
// Parent acceptance scopes exact comparisons to history geometry/roles/native state.
|
||
// No content is masked and the immutable concept is never rewritten for comparison.
|
||
export const canonicalDifferences = {
|
||
data: ['Independent synthetic text, image bytes, IDs, counts and text wrapping'],
|
||
semantics: [
|
||
'Negative variants are saved combinations; Recorded runs list the chronological executions',
|
||
'Recorded run exposes exact frozen evidence; Repeat run is illustrative',
|
||
'Current-file candidates disclose unknown identity and context membership',
|
||
],
|
||
// Closed by #249: the gallery's checkbox is Images-only (#259) and the role blocks are the concept's (PR D, F); the
|
||
// exact history comparison is tests/browser/history-concept.spec.mjs.
|
||
remainingApplicationPolish: [
|
||
'Production keeps mobile toolbar inside media panel and readable scrolling details; the concept toolbar collision is not reproduced',
|
||
],
|
||
};
|
||
|
||
export async function captureCanonicalState(page, testInfo, name, selector) {
|
||
await page.evaluate(async () => {
|
||
await document.fonts.ready;
|
||
for (const image of document.images) image.loading = 'eager';
|
||
await Promise.all([...document.images].map(image => image.decode().catch(() => {})));
|
||
});
|
||
const target = selector ? page.locator(selector).first() : page;
|
||
const path = testInfo.outputPath(`${name}.png`);
|
||
await target.screenshot({ path, animations: 'disabled' });
|
||
await testInfo.attach(name, { path, contentType: 'image/png' });
|
||
}
|
||
|
||
const CONCEPT_HISTORY_SELECTORS = Object.freeze({
|
||
surface: 'article.surface', timeline: '.timeline', positive: '.positive-lane', branch: '.variant-lane',
|
||
label: '.variant-lane > span', dot: '.variant-dot[aria-pressed="true"]', role: 'article.surface .prompt-section',
|
||
positiveLabel: '.positive-lane span',
|
||
prompt: 'article.surface .prompt-text', gallery: '.history-gallery',
|
||
heading: '.timeline-panel h2', intro: '.timeline-panel .panel-heading .small',
|
||
footer: '.timeline-lower', all: '.timeline-lower button',
|
||
repeat: '.timeline .run-dot:not([hidden])',
|
||
});
|
||
const RECORDED_HISTORY_SELECTORS = Object.freeze({
|
||
recordedPositiveLabel: '.history-positive-lane span', recordedBranch: '.history-context-branch',
|
||
recordedHeading: '.recorded-history h2', recordedTimeline: '.history-timeline', recordedCanvas: '.history-canvas',
|
||
recordedPositive: '.history-positive-lane', recordedLabel: '.history-context-label',
|
||
recordedAnchor: '.history-context-anchor', recordedRepeat: '.history-run-marker:not(.history-context-anchor)',
|
||
recordedMarker: '.history-run-marker', recordedColumn: '.history-run-column',
|
||
});
|
||
|
||
export async function historyGeometry(page, production) {
|
||
// Production renders the concept's history classes (#249 PR F), so both documents use the concept's selectors;
|
||
// production adds the recorded executions (#209), which the concept does not have.
|
||
const selectors = production ? { ...CONCEPT_HISTORY_SELECTORS, ...RECORDED_HISTORY_SELECTORS } : CONCEPT_HISTORY_SELECTORS;
|
||
return page.evaluate(selectors => ({ pointerCoarse: matchMedia('(pointer: coarse)').matches,
|
||
...Object.fromEntries(Object.entries(selectors).map(([key, selector]) => {
|
||
const nodes = [...document.querySelectorAll(selector)];
|
||
return [key, nodes.map(node => {
|
||
const style = getComputedStyle(node), before = getComputedStyle(node, '::before');
|
||
const box = node.getBoundingClientRect();
|
||
return { x: box.x, y: box.y, width: box.width, height: box.height,
|
||
padding: style.padding, top: style.top, left: style.left, background: style.backgroundColor, color: style.color,
|
||
border: style.borderTopWidth, borderColor: style.borderTopColor, radius: style.borderRadius,
|
||
fontSize: style.fontSize, fontFamily: style.fontFamily, lineHeight: style.lineHeight,
|
||
fontWeight: style.fontWeight, text: node.textContent, contextId: node.dataset.contextId || node.dataset.contextBranch,
|
||
runId: node.dataset.runId,
|
||
marginLeft: style.marginLeft, outline: style.outlineWidth, outlineColor: style.outlineColor,
|
||
outlineOffset: style.outlineOffset, before: { width: before.width, height: before.height,
|
||
top: before.top, left: before.left, borderLeft: before.borderLeftWidth,
|
||
borderBottom: before.borderBottomWidth, radius: before.borderBottomLeftRadius,
|
||
background: before.backgroundColor, color: before.color, borderColor: before.borderTopColor,
|
||
borderLeftColor: before.borderLeftColor, borderBottomColor: before.borderBottomColor,
|
||
fontSize: before.fontSize, fontFamily: before.fontFamily, fontWeight: before.fontWeight,
|
||
content: before.content } };
|
||
})];
|
||
})) }), selectors);
|
||
}
|
||
|
||
export async function nativeDialogState(locator) {
|
||
return locator.evaluate(node => {
|
||
const style = getComputedStyle(node), box = node.getBoundingClientRect();
|
||
return { modal: node.matches(':modal'), focusInside: node.contains(document.activeElement),
|
||
background: style.backgroundColor, color: style.color, borderColor: style.borderTopColor,
|
||
border: style.borderTopWidth, width: box.width, height: box.height,
|
||
viewportWidth: innerWidth, viewportHeight: innerHeight };
|
||
});
|
||
}
|
||
|
||
export async function exerciseCurrentPairSend(page, roles) {
|
||
const host = await page.context().newPage();
|
||
await host.goto('/prompt_manager/workspace#/overview');
|
||
try {
|
||
await host.evaluate(async () => {
|
||
const { createBridgeHost } = await import('/prompt_manager/js/shared/toolkit/prompt-bridge.js');
|
||
const target = { id: 'canonical-pair', label: 'Canonical destination', type: 'PromptManagerPair', roles: ['positive', 'negative'] };
|
||
window.canonicalApplied = [];
|
||
window.canonicalHost = createBridgeHost({ origin: location.origin, namespace: '/', label: 'Canonical ComfyUI', adapter: {
|
||
listTargets: () => [target],
|
||
preview: (_id, roles) => ({ preview: { target, fields: Object.entries(roles).map(([role, after]) => ({ role, before: '', after })),
|
||
composition: { prepend: '', append: '', prependConnected: false, appendConnected: false, before: '', after: roles.positive } }, snapshot: roles }),
|
||
apply: roles => { window.canonicalApplied.push(roles);return { targetId: target.id, values: roles }; },
|
||
} });
|
||
});
|
||
const viewer = page.locator('dialog#viewer-dialog');
|
||
const send = viewer.getByRole('button', { name: /^Send prompt pair to ComfyUI: / });await send.click();
|
||
const sender = page.getByRole('dialog', { name: 'Send to ComfyUI', exact: true });await expect(sender).toBeVisible();
|
||
await sender.getByRole('combobox', { name: 'ComfyUI window', exact: true }).selectOption({ label: 'Canonical ComfyUI' });
|
||
await sender.getByRole('combobox', { name: 'Destination node', exact: true }).selectOption({ label: 'Canonical destination' });
|
||
await sender.getByRole('button', { name: 'Preview changes', exact: true }).click();
|
||
await expect(sender).toContainText(roles.positive);await expect(sender).toContainText(roles.negative);
|
||
await sender.getByRole('button', { name: 'Apply to ComfyUI', exact: true }).click();await expect(sender).toContainText('Sent to ComfyUI.');
|
||
expect(await host.evaluate(() => window.canonicalApplied)).toEqual([roles]);
|
||
await page.keyboard.press('Escape');await expect(send).toBeFocused();
|
||
} finally {await host.evaluate(() => window.canonicalHost?.dispose());await host.close();}
|
||
}
|
||
|
||
export async function compareCanonicalHistory(reference, actual, testInfo) {
|
||
const path = testInfo.outputPath('canonical-history-geometry.json');
|
||
await writeFile(path, JSON.stringify({ reference, actual, comparisonScope: canonicalDifferences }, null, 2));
|
||
await testInfo.attach('canonical-history-geometry', { path, contentType: 'application/json' });
|
||
for (const geometry of [reference, actual]) {
|
||
expect.soft(geometry.role).toHaveLength(2);
|
||
expect.soft(geometry.prompt).toHaveLength(2);
|
||
expect.soft(geometry.heading[0].fontSize).toBe('14px');
|
||
expect.soft(geometry.intro[0].fontSize).toBe('12px');
|
||
expect.soft(geometry.footer).toHaveLength(1);
|
||
expect.soft(geometry.positiveLabel).toHaveLength(1);
|
||
expect.soft(geometry.positiveLabel[0]).toMatchObject({ top: '-25px', left: '38px', fontSize: '10px' });
|
||
expect.soft(geometry.surface[0].padding).toBe('22px');
|
||
expect.soft(geometry.surface[0].radius).toBe('7px');
|
||
expect.soft(geometry.timeline[0].padding).toBe('18px 20px');
|
||
expect.soft(geometry.positive[0].border).toBe('2px');
|
||
for (const [index, branch] of geometry.branch.entries()) {
|
||
expect.soft(branch.height).toBe(57);
|
||
expect.soft(branch.border).toBe('2px');
|
||
expect.soft(branch.marginLeft).toBe(`${38 + index * 47}px`);
|
||
expect.soft(branch.before).toMatchObject({ width: '30px', height: '25px', top: '-25px', left: '-30px', borderLeft: '2px', borderBottom: '2px', radius: '22px' });
|
||
}
|
||
}
|
||
expect.soft(actual.recordedPositiveLabel).toHaveLength(1);
|
||
expect.soft(actual.recordedPositiveLabel[0]).toMatchObject({ top: '-25px', left: '38px', fontSize: '10px' });
|
||
expect.soft(actual.recordedHeading[0].fontSize).toBe(reference.heading[0].fontSize);
|
||
expect.soft(actual.recordedCanvas[0].width).toBeGreaterThanOrEqual(actual.recordedTimeline[0].width - 42);
|
||
for (const geometry of [reference, actual]) {
|
||
expect.soft(geometry.runDialog).toMatchObject({ modal: true, focusInside: true, border: '1px' });
|
||
expect.soft(geometry.runDialog.width).toBeLessThanOrEqual(geometry.runDialog.viewportWidth);
|
||
expect.soft(geometry.runDialog.height).toBeLessThanOrEqual(geometry.runDialog.viewportHeight);
|
||
}
|
||
for (const property of ['background', 'color', 'borderColor']) expect.soft(actual.runDialog[property]).toBe(reference.runDialog[property]);
|
||
for (const [key, properties] of [
|
||
['surface', ['padding', 'background', 'border', 'borderColor', 'radius']],
|
||
['timeline', ['padding', 'background', 'border', 'borderColor', 'radius']],
|
||
['positive', ['border', 'borderColor']],
|
||
['positiveLabel', ['color', 'fontSize', 'top', 'left']],
|
||
['branch', ['height', 'border', 'borderColor', 'fontSize']],
|
||
['label', ['color', 'fontSize']],
|
||
['dot', ['background', 'borderColor', 'radius', 'outline', 'outlineColor', 'outlineOffset', 'color', 'fontSize']],
|
||
]) {
|
||
for (const property of properties) expect.soft(actual[key][0]?.[property], `${key}.${property}`).toBe(reference[key][0][property]);
|
||
}
|
||
for (const property of ['color', 'background']) expect.soft(actual.positive[0].before[property]).toBe(reference.positive[0].before[property]);
|
||
for (const [index, block] of actual.role.entries()) for (const property of ['border', 'borderColor', 'fontSize']) expect.soft(block[property]).toBe(reference.role[index][property]);
|
||
for (const [index, prompt] of actual.prompt.entries()) for (const property of ['fontSize', 'lineHeight', 'fontFamily']) expect.soft(prompt[property]).toBe(reference.prompt[index][property]);
|
||
assertRecordedHistory(reference, actual, { branchCount: 1, anchorCount: 1, repeatCount: 0 });
|
||
}
|
||
|
||
export function assertRecordedHistory(reference, actual, { branchCount, anchorCount, repeatCount }) {
|
||
expect(branchCount).toBeGreaterThan(0);
|
||
expect(reference.branch.length).toBeGreaterThanOrEqual(2);
|
||
expect(reference.dot).toHaveLength(1);
|
||
expect(reference.repeat.length).toBeGreaterThan(0);
|
||
expect.soft(actual.recordedBranch, 'chronological branches').toHaveLength(branchCount);
|
||
expect.soft(actual.recordedLabel, 'chronological labels').toHaveLength(branchCount);
|
||
expect.soft(actual.recordedAnchor, 'chronological anchors').toHaveLength(anchorCount);
|
||
expect.soft(actual.recordedRepeat, 'chronological repeats').toHaveLength(repeatCount);
|
||
expect.soft(actual.recordedMarker).toHaveLength(anchorCount + repeatCount);
|
||
expect.soft(actual.recordedColumn).toHaveLength(anchorCount + repeatCount);
|
||
expect.soft(actual.recordedPositive).toHaveLength(1);
|
||
for (const property of ['border', 'borderColor']) expect.soft(actual.recordedPositive[0][property], `recorded positive ${property}`).toBe(reference.positive[0][property]);
|
||
for (const property of ['color', 'background', 'width', 'height', 'fontSize']) expect.soft(actual.recordedPositive[0].before[property], `recorded positive glyph ${property}`).toBe(reference.positive[0].before[property]);
|
||
for (const [index, branch] of actual.recordedBranch.entries()) {
|
||
for (const property of ['height', 'border', 'borderColor']) expect.soft(branch[property], `recorded branch ${index} ${property}`).toBe(reference.branch[0][property]);
|
||
for (const property of ['width', 'height', 'top', 'left', 'borderLeft', 'borderBottom', 'radius', 'borderLeftColor', 'borderBottomColor']) expect.soft(branch.before[property], `recorded curve ${index} ${property}`).toBe(reference.branch[0].before[property]);
|
||
if (index) expect.soft(branch.y - actual.recordedBranch[index - 1].y, 'recorded 57px branch rhythm').toBe(reference.branch[1].y - reference.branch[0].y);
|
||
}
|
||
for (const label of actual.recordedLabel) for (const property of ['color', 'fontSize']) expect.soft(label[property], `recorded label ${property}`).toBe(reference.label[0][property]);
|
||
for (const [index, column] of actual.recordedColumn.entries()) {
|
||
expect.soft(column.left).toBe(`${38 + index * 64}px`);
|
||
if (index) expect.soft(column.x - actual.recordedColumn[index - 1].x, '64px chronological columns').toBe(64);
|
||
}
|
||
const checkMarker = (marker, canonical, anchor) => {
|
||
const visual = actual.pointerCoarse ? marker.before : marker;
|
||
const size = anchor ? 29 : 12;
|
||
expect.soft(visual.width, 'recorded marker visual width').toBe(actual.pointerCoarse ? `${size}px` : size);
|
||
expect.soft(visual.height, 'recorded marker visual height').toBe(actual.pointerCoarse ? `${size}px` : size);
|
||
for (const property of ['background', 'borderColor', 'radius']) expect.soft(visual[property], `recorded marker ${property}`).toBe(canonical[property]);
|
||
if (actual.pointerCoarse) {
|
||
expect.soft(marker.width, 'coarse marker hit width').toBeGreaterThanOrEqual(44);
|
||
expect.soft(marker.height, 'coarse marker hit height').toBeGreaterThanOrEqual(44);
|
||
expect.soft(visual.borderLeft).toBe('2px');
|
||
} else expect.soft(marker.border).toBe(canonical.border);
|
||
if (anchor) {
|
||
expect.soft(marker.text).toBe('−');
|
||
if (actual.pointerCoarse) expect.soft(visual.content).toBe('"−"');
|
||
for (const property of ['color', 'fontSize', 'fontFamily', 'fontWeight']) expect.soft(visual[property], `recorded minus ${property}`).toBe(canonical[property]);
|
||
const branch = actual.recordedBranch.find(value => value.contextId === marker.contextId);
|
||
expect(branch, 'each context anchor has its real branch').toBeTruthy();
|
||
expect.soft(Math.abs(marker.x + marker.width / 2 - branch.x)).toBeLessThanOrEqual(1);
|
||
expect.soft(Math.abs(marker.y + marker.height / 2 - branch.y)).toBeLessThanOrEqual(1);
|
||
} else expect.soft(marker.text).toBe('');
|
||
};
|
||
for (const marker of actual.recordedAnchor) checkMarker(marker, reference.dot[0], true);
|
||
for (const marker of actual.recordedRepeat) checkMarker(marker, reference.repeat[0], false);
|
||
}
|