* feat(saved-views): keep a collection in a saved view Images saved views gain a collection key (#331 D140): empty or a collection id of 1 to 9 digits. Writes refuse favorites together with a collection; older rows read an empty collection, and a stored row with both opens the collection, as the listing does for a URL with both. Part of #331 * feat(collections): store collections in the library database * feat(collections): add, remove and rename collections and keep members through duplicate cleanup * feat(collections): add collection routes and the Images collection filter * feat(images): store images' own categories in the library database (#332) One new table, image_categories, and its category index, created empty by a forward-only migration that reads and writes only its own objects. Startup checks the structure; restore also checks the values. The store sets, clears and reads own categories by file key (the deepest output source holding the file and the path below it), and copies a removed duplicate's category to a kept copy that has none. * feat(images): duplicate cleanup keeps images' own categories (#332) The kept copy's own category wins; a kept copy without one receives the removed copy's, keyed by the deepest output source holding each file. The removed copy's row is never deleted, so a give-back or a failed delete loses nothing. The job log reports how many were kept. * feat(images): set, remove and list images' own categories (#332) PUT /prompt_manager/images/category sets the own category of up to 500 listed files, DELETE removes it (listed or not), and GET /prompt_manager/images/categories lists the values whose file is listed. Targets are the Images listing identity of an output source, checked by media_target (shared with Collections). The routes never touch prompts, recipes or links; POST /prompt_manager/bulk/category is unchanged. * fix(images): key symlinked output folders and keep key work off the event loop (#332) Review fixes: a source matches by its configured spelling too, so a detected output folder that is a symlink keys its files (routes and duplicate cleanup). File keys are computed in the executor. A path no source holds is a plain 403, a lone surrogate a 400. The install repairs a table that lacks its category index instead of refusing to open. * fix(collections): address review findings * feat(images): set or remove a category on all N matching images (#332) The category routes also accept the Images listing filter of "Select all N matching" (#392) instead of explicit items, resolved now and capped at 500 images like an explicit selection. * feat(collections): browse a collection from the sidebar The sidebar gains the concept's COLLECTIONS group (D136): one row per collection with its folder icon, name and listed-member count, without the PROPOSED badge; the label shows once a collection exists. A row opens #/collection/<id>, the Images page filtered to that collection (D137): the collection's name as h1, Collection as breadcrumb and title, Edit to rename or delete it through the saved views' Edit dialog with collection nouns, and a note counting members the sources do not list now. An unknown or deleted collection shows a page that says so with a link to Images. A saved view on a deleted collection lists nothing and says so (MC6, D140). The list is read again after a restore and the counts 300 ms after a change. Part of #331 * test(collections): compare the COLLECTIONS group with the concept The concept hides COLLECTIONS at 950 px and below, which would leave a phone no way to open a collection; production shows the rows there in the wrapped layout of every other sidebar nav (D136). The shell comparison now compares the group instead of filtering it out: the concept fixture seeds Landscapes (12) and Experiments (8), the rows compare by name order, and at phone width the nav compares against the concept's own sidebar-nav layout. The collection rows are checked at 1600x1100 and 390x844 in both themes. Part of #331 * test(vendor): count the #332 host case in the execution matrix image-attribution.spec.mjs gains the image category route case, so the execution config lists 92 tests (3 attribution cases per project). * test(browser): install the slideshow clock before wrapping setTimeout The slideshow fixture wrapped window.setTimeout before page.clock.install(), so the viewer's timer ran on real time and clock.runFor() did not drive it; a late WebKit timer failed 'slideshow exposes exact state labels' on CI. * feat(collections): add and remove from the selection bar Add to collection follows Set category in the Images selection bar and opens the concept's simpleInput ("Add selected images to collection", "Collection name", Add) with the existing names as a datalist. Remove from collection follows it while a collection filter is active and reloads the listing in place, keeping the checked files still listed. Every outcome uses the design's strings (section 7.4). The routes take at most 500 explicit files, so an "all N matching" selection is sent only when every match is loaded, checked and at most 500; otherwise the action toasts "Select at most 500 images." (D138, #331). * fix(collections): address review findings - A list read superseded by a newer one (the 300 ms count read, a restore) no longer shows "could not be loaded": the collection and saved-view pages wait for the list to settle. - A listing that finds the open collection gone shows the deleted page once the list no longer holds it; when the list read fails or still holds it, the page keeps the listing's error and Retry instead of staying blank, and each failed read is reported again. - The missing-members note follows every list read and goes away at zero. - A rename that settles after its Edit dialog closed leaves any dialog opened since alone. - The deleted-collection, list-failed and saved-view failure pages focus their title after a route change, as every page does. Part of #331 * feat(collections): add and remove from the inspector and the viewer The shared inspector's footer ends with Collections… (folder icon) after Prompt history for a listed file, in the Images side panel and the viewer. Its dialog reads the file's membership, lists every collection as the concept's checkbox rows, takes an optional new name, and Save sends one request per change (new name, added, removed). A failure keeps the dialog with the membership read again. On a collection page a change to the open collection reloads the listing at once from the side panel and only when the viewer closes from the viewer. The inspector concept comparison draws the button into the concept after Prompt history (D139, #331). * test(collections): compare the collection page and dialog with the concept images-concept compares Add to collection in place in the selection bar (only Remove links… stays omitted) and the collection page's heading, toolbar and filter row against the concept's #collection-landscapes, with D137's Edit drawn into the concept. collections-concept compares the Add to collection dialog with the concept's simpleInput (D138: "Add", an empty field, the datalist of names), in both themes at 1600 and 390 px, with a mutation check. TESTING.md gains the Collections contract (database, keys, missing members, duplicate move, restore, routes, rules, limits, the PR 1 rulings and the all-matching ruling), D136-D140, and amends D28 and D8; docs/application-redesign.md gets the delivery-status line. The coverage baseline adds the two new modules; optional collection callbacks are null rather than no-op defaults so they do not count as uncovered functions. * test(coverage): keep main's floors for files this PR does not touch coverage:update raised nine floors of untouched files from one run; metadata-autocomplete.js branches then measured 84.84 against 85. * fix(collections): address review findings - M1: after a failed Save the Collections dialog shows the membership loading and keeps Save disabled until the re-read lands, so a stale plan cannot be sent. - M2: the changes a Save made reach the page only when the dialog closes, so a collection page's reload cannot remove the dialog before its failure is read. - L4: a New collection name equal to a listed collection ignoring case is that collection's checkbox, checked; never an add then a remove. - L5: a name that cannot be a collection name is refused on the field; nothing is sent, the checkbox edits stay, no re-read. - L6: focus starts on the field and moves to the first checkbox once listed; closing after a re-render replaced the trigger focuses the inspector's current Collections… button or its heading (openContentDialog takes an optional focusTarget). - L3, L7: TESTING.md D138/D139 describe the stale-source and deleted collection outcomes and the above; the viewer spec asserts no listing request while it is open, and a browser test covers M2. * test(legacy): record the image category routes in the legacy contract snapshot (#332) #332 adds PUT/DELETE /prompt_manager/images/category and GET /prompt_manager/images/categories; the legacy pages' routes are unchanged. * test(duplicates): a removed copy with a collection and a category moves both (#331, #332) * test(collections): map the Add to collection suggestions to the shared dialog's datalist (#331) After the merge with #332 PR 3 the input dialog places its datalist after the field with the id workspace-input-suggestions; the concept mapping follows.
316 lines
15 KiB
JavaScript
316 lines
15 KiB
JavaScript
/**
|
||
* Collections (#331): named, hand-picked groups of images, persisted through `/prompt_manager/collections*`.
|
||
*
|
||
* - D136: the sidebar COLLECTIONS group (the concept's `#collections-nav`, index.html 28–31, app.js 336–339) lists
|
||
* each collection as `#/collection/<id>` with its listed-member count, without the concept's "PROPOSED" badge.
|
||
* - D137: a collection page is Images filtered to the collection; its Edit renames or deletes it through the saved
|
||
* views' Edit dialog (D51) with collection nouns.
|
||
* - This module holds the client store (`createCollections`), the route hash, the name rule and every user-facing
|
||
* string of the design (§7.4, §8), so the selection bar, the inspector and the shell say the same things.
|
||
*/
|
||
import { noun } from './plural.mjs';
|
||
import { openEditDialog } from './saved-views.mjs';
|
||
|
||
export const COLLECTIONS_URL = '/prompt_manager/collections';
|
||
export const COLLECTION_ITEMS_URL = `${COLLECTIONS_URL}/items`;
|
||
export const COLLECTION_MEMBERSHIP_URL = `${COLLECTIONS_URL}/membership`;
|
||
export const MAX_COLLECTION_NAME_LENGTH = 100;
|
||
// The routes' cap on one add or remove (the bulk tagging cap, MAX_BULK_IMAGES).
|
||
export const MAX_COLLECTION_ITEMS = 500;
|
||
// Counts are re-read once after a run of confirmed changes settles, as the Favorites count (#249 M1).
|
||
export const COLLECTION_COUNT_DELAY_MS = 300;
|
||
|
||
// Strings (design §7.4 and §8).
|
||
export const ADD_DIALOG_TITLE = 'Add selected images to collection';
|
||
export const ADD_DIALOG_LABEL = 'Collection name';
|
||
export const ADD_DIALOG_ACTION = 'Add';
|
||
export const TOO_MANY_TOAST = `Select at most ${MAX_COLLECTION_ITEMS} images.`;
|
||
export const FILES_NOT_FOUND_TOAST = 'None of the selected images could be found. Refresh the images and try again.';
|
||
export const SOURCE_CHANGED_TOAST = 'The sources changed. Refresh the images and try again.';
|
||
export const ADD_FAILED_TOAST = 'The images could not be added. Try again.';
|
||
export const REMOVE_FAILED_TOAST = 'The images could not be removed. Try again.';
|
||
export const COLLECTION_GONE_TOAST = 'That collection no longer exists.';
|
||
export const RENAMED_TOAST = 'Collection renamed.';
|
||
export const RENAME_FAILED_TOAST = 'The collection could not be renamed. Try again.';
|
||
export const DELETED_TOAST = 'Collection deleted.';
|
||
export const DELETE_FAILED_TOAST = 'The collection could not be deleted. Try again.';
|
||
export const DELETED_PAGE_TEXT = 'This collection no longer exists.';
|
||
export const OPEN_IMAGES_LINK = 'Open Images';
|
||
export const VIEW_COLLECTION_DELETED = 'The collection this view uses was deleted.';
|
||
export const LIST_FAILED_TEXT = 'Collections could not be loaded. Your saved data has not changed.';
|
||
export const COLLECTIONS_UPDATED_TOAST = 'Collections updated.';
|
||
export const UPDATE_FAILED_TEXT = 'The collections could not be updated. Try again.';
|
||
export const MEMBERSHIP_LOADING_TEXT = 'Loading collections…';
|
||
export const MEMBERSHIP_FAILED_TEXT = 'Collections could not be loaded.';
|
||
export const NO_COLLECTIONS_TEXT = 'No collections yet. Name one below.';
|
||
|
||
const CONTROL = /[\u0000-\u001f\u007f]/;
|
||
const isCount = value => Number.isSafeInteger(value) && value >= 0;
|
||
const isId = value => Number.isSafeInteger(value) && value >= 1 && value <= 999_999_999;
|
||
|
||
/** The route of one collection. */
|
||
export function collectionHash(id) {
|
||
if (!isId(id)) throw new TypeError('Invalid collection id');
|
||
return `#/collection/${id}`;
|
||
}
|
||
|
||
/**
|
||
* A name as the database stores it (design §1): trimmed, each run of whitespace one space, 1 to 100 characters
|
||
* without control characters; null otherwise. Tabs and newlines are whitespace, so they collapse.
|
||
*/
|
||
export function normalizeCollectionName(value) {
|
||
if (typeof value !== 'string') return null;
|
||
const name = value.trim().replace(/\s+/g, ' ');
|
||
return name.length >= 1 && name.length <= MAX_COLLECTION_NAME_LENGTH && !CONTROL.test(name) ? name : null;
|
||
}
|
||
|
||
/** One listed collection, or null when the row is not usable. `count` and `missing` are null unless counts. */
|
||
export function parseCollection(row) {
|
||
if (!isId(row?.id) || typeof row.name !== 'string' || !row.name.trim()) return null;
|
||
const counted = isCount(row.count) && isCount(row.missing);
|
||
return { id: row.id, name: row.name, count: counted ? row.count : null, missing: counted ? row.missing : null };
|
||
}
|
||
|
||
/** The listing's collections in the server's order (name, then id), skipping unusable rows. */
|
||
export function parseCollections(data) {
|
||
if (!Array.isArray(data?.collections)) throw new TypeError('Invalid collections');
|
||
return data.collections.map(parseCollection).filter(Boolean);
|
||
}
|
||
|
||
/** The sidebar's order while a re-read is pending: an approximation of the server's name key, then id. */
|
||
export const collectionNameKey = name => name.normalize('NFC').toLowerCase().normalize('NFC');
|
||
const nameKey = collectionNameKey;
|
||
const ordered = list => [...list].sort((a, b) => {
|
||
const left = nameKey(a.name), right = nameKey(b.name);
|
||
return left < right ? -1 : left > right ? 1 : a.id - b.id;
|
||
});
|
||
|
||
/** "Added N images to “X”." with what was already in it and what could not be found. */
|
||
export function addedMessage({ collection, added, already, notFound }) {
|
||
if (added === 0 && notFound === 0) return `All selected images were already in “${collection.name}”.`;
|
||
let text = `Added ${added} ${noun(added, 'image')} to “${collection.name}”.`;
|
||
if (already > 0) text += already === 1 ? ' 1 was already in it.' : ` ${already} were already in it.`;
|
||
if (notFound > 0) text += ` ${notFound} could not be found.`;
|
||
return text;
|
||
}
|
||
|
||
export function removedMessage(name, removed) {
|
||
return `Removed ${removed} ${noun(removed, 'image')} from “${name}”.`;
|
||
}
|
||
|
||
export function nameTakenMessage(name) {
|
||
return `A collection named “${name}” already exists.`;
|
||
}
|
||
|
||
/** The Delete confirmation, with the stored count (listed plus missing) when the counts are known. */
|
||
export function deleteQuestion({ name, count, missing }) {
|
||
if (!isCount(count) || !isCount(missing)) {
|
||
return `Delete “${name}”? Its images stay where they are; only the collection is removed.`;
|
||
}
|
||
const stored = count + missing;
|
||
return stored === 1
|
||
? `Delete “${name}”? Its 1 image stays where it is; only the collection is removed.`
|
||
: `Delete “${name}”? Its ${stored} images stay where they are; only the collection is removed.`;
|
||
}
|
||
|
||
/** The collection page's note about members its sources do not list now (MC3); empty when there are none. */
|
||
export function missingNote(missing) {
|
||
if (!isCount(missing) || missing === 0) return '';
|
||
return missing === 1
|
||
? '1 image in this collection is not in your current sources.'
|
||
: `${missing} images in this collection are not in your current sources.`;
|
||
}
|
||
|
||
export const isCollectionGone = error => error?.code === 'collection-not-found';
|
||
|
||
/** A failed add or remove's toast: the routes' error codes, else `fallback`. */
|
||
export function writeFailure(error, fallback) {
|
||
if (isCollectionGone(error)) return COLLECTION_GONE_TOAST;
|
||
if (error?.code === 'source-changed') return SOURCE_CHANGED_TOAST;
|
||
if (error?.code === 'files-not-found') return FILES_NOT_FOUND_TOAST;
|
||
return fallback;
|
||
}
|
||
|
||
/** The Edit dialog's mapping of a failed rename of `name` (openEditDialog `renameError`). */
|
||
export function renameFailure(name) {
|
||
return error => {
|
||
if (error?.code === 'name-taken') return { field: nameTakenMessage(name) };
|
||
if (isCollectionGone(error)) return { toast: COLLECTION_GONE_TOAST, close: true };
|
||
return { toast: RENAME_FAILED_TOAST };
|
||
};
|
||
}
|
||
|
||
/** The collection nouns of the shared Edit dialog (D51, D137). */
|
||
export const COLLECTION_NOUNS = Object.freeze({
|
||
title: 'Edit collection', label: 'Collection name', deleteTitle: 'Delete collection', deleteText: deleteQuestion,
|
||
renamed: RENAMED_TOAST, renameFailed: RENAME_FAILED_TOAST, deleted: DELETED_TOAST, deleteFailed: DELETE_FAILED_TOAST,
|
||
});
|
||
|
||
/**
|
||
* D137: the open collection's Edit. A taken name stays in the dialog under the field; a failed rename keeps it open;
|
||
* a collection deleted meanwhile closes it and runs `onGone()` after the toast. `onRename(name)` sends the normalized
|
||
* name; a delete's 404 counts as deleted (the store's `delete`).
|
||
*/
|
||
export function openEditCollectionDialog({ scope, trigger, collection, onRename, onDelete, onGone = () => {} }) {
|
||
let attempted = '';
|
||
const mapping = error => {
|
||
const outcome = renameFailure(attempted)(error);
|
||
if (outcome.close) queueMicrotask(onGone);
|
||
return outcome;
|
||
};
|
||
openEditDialog({ scope, trigger, item: collection, nouns: COLLECTION_NOUNS, onDelete, renameError: mapping,
|
||
onRename: name => {
|
||
attempted = normalizeCollectionName(name) ?? name;
|
||
return onRename(attempted);
|
||
} });
|
||
}
|
||
|
||
function fileTargets(items) {
|
||
if (!Array.isArray(items) || items.length < 1 || items.length > MAX_COLLECTION_ITEMS) {
|
||
throw new TypeError('A collection change needs 1 to 500 files');
|
||
}
|
||
return items.map(item => {
|
||
if (!Number.isSafeInteger(item?.root_index) || item.root_index < 0 || typeof item.root_scope !== 'string' ||
|
||
!item.root_scope || typeof item.path !== 'string' || !item.path) {
|
||
throw new TypeError('Invalid collection file');
|
||
}
|
||
return { root_index: item.root_index, root_scope: item.root_scope, path: item.path };
|
||
});
|
||
}
|
||
|
||
function requireId(id) {
|
||
if (!isId(id)) throw new TypeError('Invalid collection id');
|
||
return id;
|
||
}
|
||
|
||
function requireName(name) {
|
||
const normalized = normalizeCollectionName(name);
|
||
if (normalized === null) throw new TypeError('Invalid collection name');
|
||
return normalized;
|
||
}
|
||
|
||
/** The `{id, name}` a write answered with. */
|
||
function answered(data) {
|
||
const collection = parseCollection(data?.collection);
|
||
if (!collection) throw new TypeError('Invalid collection');
|
||
return { id: collection.id, name: collection.name };
|
||
}
|
||
|
||
function countOf(value) {
|
||
if (!isCount(value)) throw new TypeError('Invalid collection count');
|
||
return value;
|
||
}
|
||
|
||
/**
|
||
* The shell's collection list. `load()` re-reads it (a newer read supersedes an older one), `subscribe(fn)` reports
|
||
* `{collections, status}` on every change, `settled()` resolves once no read is in flight; `status` is 'loading',
|
||
* 'ready' or 'error' and a failed read keeps the last list. `add`, `remove`, `rename` and `delete` change the listed
|
||
* rows at once and re-read the counts once, 300 ms after the last confirmed change; a write to a collection that is
|
||
* gone (404 `collection-not-found`) re-reads the list at once and rejects. `timers` is a test seam.
|
||
*/
|
||
export function createCollections(api, signal, { setTimer = setTimeout, clearTimer = clearTimeout } = {}) {
|
||
let collections = [], status = 'loading', request = null, timer = 0;
|
||
const listeners = new Set();
|
||
let waiting = [];
|
||
const emit = () => {
|
||
const snapshot = { collections, status };
|
||
for (const listener of listeners) listener(snapshot);
|
||
if (status !== 'loading') { const done = waiting; waiting = []; for (const resolve of done) resolve(snapshot); }
|
||
};
|
||
const stopTimer = () => { if (timer) clearTimer(timer); timer = 0; };
|
||
signal?.addEventListener('abort', () => { stopTimer(); request?.abort(); }, { once: true });
|
||
function load() {
|
||
if (signal?.aborted) return Promise.resolve();
|
||
request?.abort();
|
||
const controller = new AbortController();
|
||
request = controller;
|
||
status = 'loading';
|
||
emit();
|
||
return api.get(COLLECTIONS_URL, { signal: controller.signal, cache: 'no-store' }).then(data => {
|
||
if (request !== controller) return;
|
||
collections = parseCollections(data);
|
||
status = 'ready';
|
||
}).catch(() => {
|
||
if (request !== controller) return;
|
||
status = 'error';
|
||
}).finally(() => {
|
||
if (request !== controller || signal?.aborted) return;
|
||
request = null;
|
||
emit();
|
||
});
|
||
}
|
||
function changed(next) {
|
||
collections = ordered(next);
|
||
emit();
|
||
stopTimer();
|
||
timer = setTimer(() => { timer = 0; load(); }, COLLECTION_COUNT_DELAY_MS);
|
||
}
|
||
/** Send one write; a collection found gone meanwhile re-reads the list before the error reaches the caller. */
|
||
async function send(write) {
|
||
try {
|
||
return await write();
|
||
} catch (error) {
|
||
if (isCollectionGone(error)) load();
|
||
throw error;
|
||
}
|
||
}
|
||
async function add(target, items) {
|
||
const byId = target?.collectionId !== undefined, byName = target?.name !== undefined;
|
||
if (byId === byName) throw new TypeError('A collection is named by its id or a name');
|
||
const body = byId ? { collection_id: requireId(target.collectionId) } : { name: requireName(target.name) };
|
||
body.items = fileTargets(items);
|
||
const data = await send(() => api.post(COLLECTION_ITEMS_URL, body, { signal }));
|
||
const result = { collection: answered(data), created: data.created === true, added: countOf(data.added),
|
||
already: countOf(data.already), notFound: countOf(data.not_found) };
|
||
const { id, name } = result.collection;
|
||
changed(collections.some(item => item.id === id)
|
||
? collections.map(item => item.id === id ? { ...item, name } : item)
|
||
: [...collections, { id, name, count: null, missing: null }]);
|
||
return result;
|
||
}
|
||
async function remove(id, items) {
|
||
const body = { collection_id: requireId(id), items: fileTargets(items) };
|
||
const data = await send(() => api.del(COLLECTION_ITEMS_URL, { signal, body }));
|
||
const result = { collection: answered(data), removed: countOf(data.removed) };
|
||
changed(collections);
|
||
return result;
|
||
}
|
||
async function membership(identity) {
|
||
const [file] = fileTargets([identity]);
|
||
const query = new URLSearchParams({ root_index: String(file.root_index), root_scope: file.root_scope, path: file.path });
|
||
const data = await api.get(`${COLLECTION_MEMBERSHIP_URL}?${query}`, { signal, cache: 'no-store' });
|
||
const ids = data?.collection_ids;
|
||
if (!Array.isArray(ids) || !ids.every(isId)) throw new TypeError('Invalid collection membership');
|
||
return [...ids];
|
||
}
|
||
async function rename(id, name) {
|
||
const url = `${COLLECTIONS_URL}/${requireId(id)}`;
|
||
const body = { name: requireName(name) };
|
||
const renamed = answered(await send(() => api.patch(url, body, { signal })));
|
||
changed(collections.map(item => item.id === renamed.id ? { ...item, name: renamed.name } : item));
|
||
return renamed;
|
||
}
|
||
async function deleteCollection(id) {
|
||
const url = `${COLLECTIONS_URL}/${requireId(id)}`;
|
||
try {
|
||
await api.del(url, { signal });
|
||
} catch (error) {
|
||
// Already gone (another tab deleted it): the outcome the user asked for.
|
||
if (error?.status !== 404) throw error;
|
||
}
|
||
changed(collections.filter(item => item.id !== id));
|
||
return id;
|
||
}
|
||
return {
|
||
load, add, remove, membership, rename, delete: deleteCollection,
|
||
get collections() { return collections; },
|
||
get status() { return status; },
|
||
find: id => collections.find(item => item.id === id) ?? null,
|
||
settled: () => status === 'loading' ? new Promise(resolve => waiting.push(resolve)) : Promise.resolve({ collections, status }),
|
||
subscribe(listener) {
|
||
listeners.add(listener);
|
||
return () => listeners.delete(listener);
|
||
},
|
||
};
|
||
}
|