Vito
e9996996e2
* feat(views): saved-views store and API
Add a saved_views table (page images|library, trimmed 1-100 character
name, whitelisted JSON state of at most 4 KB, position, timestamps)
installed through the same validated-savepoint migration as image
favorites. It is optional in old backups and required in a migrated
restore stage; restore rejects a tampered definition, extra indexes and
any row that would fail write validation.
Routes under /prompt_manager/saved-views: GET lists views by position,
POST {page,name,state} returns 201 {success, view}, PATCH /{id} {name}
renames and DELETE /{id} removes, both 404 for an unknown id. The state
must hold exactly the page's toolbar and Refine-this-view keys (Images:
q, category, sort, source, folder, media, tags; Library: q, category,
sort, tags) with their types and sort/media values; anything else is a
400.
Refs #249
* feat(views): Save view, the SAVED VIEWS sidebar and opening a view
The shared toolbar gains the concept's Save view between sort and Filters
on Images and the Prompt library. It opens the concept's simpleInput
("Save this view", "View name", default "Search: <q>" or "My workspace
view", Cancel / Save); an empty name is "Saved view". A save posts the
page's full whitelisted state (toolbar value plus Refine filters) and
toasts "Saved view added to the sidebar.".
The shell adds the concept's SAVED VIEWS label and nav#saved-nav, loaded
with the shell and re-read after every save. Rows use the concept's
links() markup (search icon, name, no count) and link #/saved/<id>.
Opening one mounts its page with the saved state through the page's own
filters, so the toolbar and "Filters · N" (D44) show it; the h1,
breadcrumb and title are the view's name. A removed Source or Folder is
dropped to its default after discovery, so no listing read is rejected;
an unknown id re-reads the list once, then opens Images; a failed list
read offers Retry.
D16 is retired: images-concept and library-concept no longer map Save
view out. New deviations: D49 (no PROPOSED badge) and D50 (no Needs
review row); shell-concept maps Favorites out until Task 3 and compares
a saved row against the concept's. Browser fixtures now wipe
saved_views.
* feat(views): Edit rename/delete and the Favorites saved view
- Favorites is the first SAVED VIEWS row (star icon, name, real count).
The count is the Favorites listing's own limit=1 total, follows the
nav-count rules and is re-read after every confirmed star or unstar.
- #/favorites opens Images filtered to favorites. The workspace listing
takes favorites=1: each selected root's favorites are read through the
image_favorites primary key and matched against the cached scan with the
toggle's case folding; a failed read is an error, never an unfiltered
page. The cursor scope includes the flag.
- Saved Images state gains a required favorites boolean, so Save view on
Favorites reopens the favorites.
- An open saved view's heading leads with Edit: "Edit saved view" with
View name, Delete... (danger), Cancel and Save. Delete... confirms in the
same dialog (never window.confirm). Toasts "Saved view renamed." and
"Saved view deleted."; a delete returns to the view's plain page.
- shell-concept no longer maps Favorites out (Needs review stays, D50).
Recorded as D51 in TESTING.md.
* fix(views): open stale saved views safely and finish the review fixes
Startup and restore now check only the saved_views structure (table,
columns, types, sizes, a JSON object state) and never the value rules,
so a row saved under older rules no longer stops the database from
opening. Reads normalize each view: missing keys take their defaults,
unknown keys are dropped, invalid values default and the name is made
displayable. POST and PATCH still validate strictly.
Only request validation (SavedViewInvalid) maps to 400; database and
internal errors are a logged generic 500. A saved view no longer
replaces the plain Images or Library return state, a toolbar change
while sources load keeps a saved Source and Folder, a state over 4 KB
is refused in the browser with its own toast, the delete confirmation
skips its failure toast after the page is gone, the Edit dialog reuses
the shared field helper, and quick star toggles coalesce into one
Favorites count read.
* test(views): cover leaving a pending saved view and add its coverage floor
A saved view left while the list or a rename is still pending leaves
the next page alone; the shell drops two unreachable heading guards.
workspace/saved-views.mjs gets its frontend coverage baseline entry;
no existing floor changes.
* fix(views): a corrupt saved-view state no longer blocks startup
At startup a saved_views row whose state is not a JSON object is
logged as a warning by id only and left in place. The listing and
rename skip it, so its #/saved/<id> link behaves like a missing view.
Restore stays strict and still rejects a backup holding such a row.
203 lines
11 KiB
JavaScript
203 lines
11 KiB
JavaScript
// Saved views (#249 D16): the state whitelist, the concept's default name, the listing parser and the shell's store.
|
||
const test = require('node:test');
|
||
const assert = require('node:assert/strict');
|
||
|
||
const source = import('../../web/js/workspace/saved-views.mjs');
|
||
|
||
const IMAGE_DEFAULTS = { q: '', category: '', sort: 'newest', source: 'all', folder: '', media: 'all', tags: [], favorites: false };
|
||
const LIBRARY_DEFAULTS = { q: '', category: '', sort: 'newest', tags: [] };
|
||
|
||
test('a saved state always holds every page key and keeps only values its page accepts', async () => {
|
||
const { normalizeViewState, SAVED_VIEW_PAGES } = await source;
|
||
assert.deepEqual(SAVED_VIEW_PAGES, ['images', 'library']);
|
||
assert.deepEqual(normalizeViewState('images', {}), IMAGE_DEFAULTS);
|
||
assert.deepEqual(normalizeViewState('library', null), LIBRARY_DEFAULTS);
|
||
const full = { q: 'castle', category: 'Portraits', sort: 'name-desc', source: '2', folder: 'a/b', media: 'video', tags: ['moody', 'fog'], favorites: true };
|
||
assert.deepEqual(normalizeViewState('images', full), full);
|
||
// D51: favorites is a boolean; anything else is the whole listing.
|
||
for (const favorites of ['true', 1, null]) assert.equal(normalizeViewState('images', { ...full, favorites }).favorites, false);
|
||
// Each rejected value falls back on its own; the rest of the view still applies.
|
||
assert.deepEqual(normalizeViewState('images', { ...full, sort: 'bogus', source: '-1', media: 'audio', tags: ['a,b'], extra: 1 }),
|
||
{ ...full, sort: 'newest', source: 'all', media: 'all', tags: [] });
|
||
assert.deepEqual(normalizeViewState('images', { ...full, q: 'x'.repeat(501), folder: 7, tags: Array(21).fill('t') }),
|
||
{ ...full, q: '', folder: '', tags: [] });
|
||
assert.deepEqual(normalizeViewState('images', { ...full, category: 'bad\u0007', tags: [' '] }), { ...full, category: '', tags: [] });
|
||
// Library has no source, folder or media, and no Name Z–A.
|
||
assert.deepEqual(normalizeViewState('library', { ...full, sort: 'name-desc' }), { q: 'castle', category: 'Portraits', sort: 'newest', tags: ['moody', 'fog'] });
|
||
assert.deepEqual(normalizeViewState('library', { sort: 'oldest' }), { ...LIBRARY_DEFAULTS, sort: 'oldest' });
|
||
// The returned tags are a copy.
|
||
const tags = ['one'];
|
||
const state = normalizeViewState('library', { tags });
|
||
state.tags.push('two');
|
||
assert.deepEqual(tags, ['one']);
|
||
assert.throws(() => normalizeViewState('tags', {}), TypeError);
|
||
});
|
||
|
||
test('the default name is the concept search name, else My workspace view, within the name limit', async () => {
|
||
const { defaultViewName } = await source;
|
||
assert.equal(defaultViewName('neon'), 'Search: neon');
|
||
assert.equal(defaultViewName(' neon city '), 'Search: neon city');
|
||
assert.equal(defaultViewName(''), 'My workspace view');
|
||
assert.equal(defaultViewName(' '), 'My workspace view');
|
||
assert.equal(defaultViewName(undefined), 'My workspace view');
|
||
assert.equal(defaultViewName('x'.repeat(500)).length, 100);
|
||
});
|
||
|
||
test('the listing keeps usable views in order and normalizes their state', async () => {
|
||
const { parseSavedViews, parseSavedView, savedViewHash } = await source;
|
||
const views = parseSavedViews({ success: true, views: [
|
||
{ id: 3, page: 'library', name: 'Neon', state: { q: 'neon', category: '', sort: 'name', tags: [] } },
|
||
{ id: 0, page: 'images', name: 'Bad id', state: {} },
|
||
{ id: 4, page: 'tags', name: 'Bad page', state: {} },
|
||
{ id: 5, page: 'images', name: ' ', state: {} },
|
||
{ id: 1, page: 'images', name: 'Videos', state: { media: 'video', source: '9' } },
|
||
] });
|
||
assert.deepEqual(views, [
|
||
{ id: 3, page: 'library', name: 'Neon', state: { q: 'neon', category: '', sort: 'name', tags: [] } },
|
||
{ id: 1, page: 'images', name: 'Videos', state: { ...IMAGE_DEFAULTS, media: 'video', source: '9' } },
|
||
]);
|
||
assert.equal(parseSavedView(null), null);
|
||
assert.throws(() => parseSavedViews({ success: true }), TypeError);
|
||
assert.equal(savedViewHash(12), '#/saved/12');
|
||
});
|
||
|
||
test('page filters and saved states convert both ways', async () => {
|
||
const { imagesFilters, imagesViewState, libraryFilters, libraryViewState } = await source;
|
||
const filters = { q: 'castle', category: 'Portraits', sort: 'rating', root: '1', subfolder: 'x', media: 'image', tags: ['fog'], favorites: true };
|
||
const state = imagesViewState(filters);
|
||
assert.deepEqual(state, { q: 'castle', category: 'Portraits', sort: 'rating', source: '1', folder: 'x', media: 'image', tags: ['fog'], favorites: true });
|
||
assert.deepEqual(imagesFilters(state), filters);
|
||
assert.deepEqual(imagesFilters({}), { q: '', category: '', sort: 'newest', root: 'all', subfolder: '', media: 'all', tags: [], favorites: false });
|
||
assert.equal(imagesViewState({ ...filters, favorites: undefined }).favorites, false);
|
||
const shelf = { text: 'neon', category: 'Cities', sort: 'oldest', tags: ['night'] };
|
||
assert.deepEqual(libraryViewState(shelf), { q: 'neon', category: 'Cities', sort: 'oldest', tags: ['night'] });
|
||
assert.deepEqual(libraryFilters(libraryViewState(shelf)), shelf);
|
||
});
|
||
|
||
function fakeApi() {
|
||
const calls = [];
|
||
const pending = [];
|
||
const api = {
|
||
calls,
|
||
get(url, options) {
|
||
calls.push(['GET', url, options.cache]);
|
||
return new Promise((resolve, reject) => pending.push({ resolve, reject, signal: options.signal }));
|
||
},
|
||
post(url, body) {
|
||
calls.push(['POST', url, body]);
|
||
return Promise.resolve({ success: true, view: { id: 9, ...body } });
|
||
},
|
||
patch(url, body) {
|
||
calls.push(['PATCH', url, body]);
|
||
return api.patchResult ?? Promise.resolve({ success: true, view: { id: 9, page: 'images', name: body.name, state: {} } });
|
||
},
|
||
del(url) {
|
||
calls.push(['DELETE', url]);
|
||
return api.deleteResult ?? Promise.resolve({ success: true, id: 9 });
|
||
},
|
||
};
|
||
return { api, pending };
|
||
}
|
||
|
||
const flush = () => new Promise(resolve => setImmediate(resolve));
|
||
|
||
test('the store reports loads, keeps the last views after a failed read, and a newer read supersedes', async () => {
|
||
const { createSavedViews, SAVED_VIEWS_URL } = await source;
|
||
const { api, pending } = fakeApi();
|
||
const controller = new AbortController();
|
||
const store = createSavedViews(api, controller.signal);
|
||
const seen = [];
|
||
store.subscribe(next => seen.push([next.status, next.views.map(view => view.id)]));
|
||
store.load();
|
||
const settled = store.settled();
|
||
pending[0].resolve({ success: true, views: [{ id: 2, page: 'images', name: 'A', state: {} }] });
|
||
assert.equal((await settled).status, 'ready');
|
||
assert.deepEqual(store.find(2).state, IMAGE_DEFAULTS);
|
||
assert.equal(store.find(3), null);
|
||
assert.deepEqual(api.calls[0], ['GET', SAVED_VIEWS_URL, 'no-store']);
|
||
|
||
store.load();
|
||
pending[1].reject(new Error('offline'));
|
||
await flush();
|
||
assert.equal(store.status, 'error');
|
||
assert.deepEqual(store.views.map(view => view.id), [2]);
|
||
|
||
// A second read aborts the first; only the newer one lands.
|
||
store.load();
|
||
store.load();
|
||
assert.equal(pending[2].signal.aborted, true);
|
||
pending[2].resolve({ success: true, views: [] });
|
||
pending[3].resolve({ success: true, views: [{ id: 5, page: 'library', name: 'B', state: {} }] });
|
||
await flush();
|
||
assert.deepEqual(store.views.map(view => view.id), [5]);
|
||
assert.deepEqual(seen, [['loading', []], ['ready', [2]], ['loading', [2]], ['error', [2]], ['loading', [2]], ['loading', [2]], ['ready', [5]]]);
|
||
controller.abort();
|
||
});
|
||
|
||
test('creating a view posts the full state and re-reads the list', async () => {
|
||
const { createSavedViews, SAVED_VIEWS_URL } = await source;
|
||
const { api, pending } = fakeApi();
|
||
const store = createSavedViews(api);
|
||
const created = store.create('library', 'Neon', { q: 'neon' });
|
||
await flush();
|
||
assert.deepEqual(api.calls[0], ['POST', SAVED_VIEWS_URL, { page: 'library', name: 'Neon', state: { ...LIBRARY_DEFAULTS, q: 'neon' } }]);
|
||
pending[0].resolve({ success: true, views: [{ id: 9, page: 'library', name: 'Neon', state: { q: 'neon' } }] });
|
||
assert.deepEqual(await created, { id: 9, page: 'library', name: 'Neon', state: { ...LIBRARY_DEFAULTS, q: 'neon' } });
|
||
assert.equal(store.find(9).name, 'Neon');
|
||
const broken = createSavedViews({ ...api, post: () => Promise.resolve({ success: true, view: null }) });
|
||
await assert.rejects(broken.create('images', 'X', {}), TypeError);
|
||
});
|
||
|
||
test('renaming and deleting a view re-read the list, whatever the outcome', async () => {
|
||
const { createSavedViews, SAVED_VIEWS_URL } = await source;
|
||
const { api, pending } = fakeApi();
|
||
const store = createSavedViews(api);
|
||
const renamed = store.rename(9, 'Dusk');
|
||
await flush();
|
||
assert.deepEqual(api.calls[0], ['PATCH', `${SAVED_VIEWS_URL}/9`, { name: 'Dusk' }]);
|
||
assert.deepEqual(api.calls[1], ['GET', SAVED_VIEWS_URL, 'no-store']);
|
||
pending[0].resolve({ success: true, views: [{ id: 9, page: 'images', name: 'Dusk', state: {} }] });
|
||
assert.deepEqual(await renamed, { id: 9, page: 'images', name: 'Dusk', state: IMAGE_DEFAULTS });
|
||
assert.equal(store.find(9).name, 'Dusk');
|
||
|
||
const removed = store.remove(9);
|
||
await flush();
|
||
assert.deepEqual(api.calls[2], ['DELETE', `${SAVED_VIEWS_URL}/9`]);
|
||
pending[1].resolve({ success: true, views: [] });
|
||
assert.equal(await removed, 9);
|
||
assert.equal(store.find(9), null);
|
||
|
||
// A view another tab already deleted is the outcome asked for; any other failure rejects, after a re-read.
|
||
api.deleteResult = Promise.reject(Object.assign(new Error('Not found'), { status: 404 }));
|
||
const gone = store.remove(4);
|
||
await flush();
|
||
pending[2].resolve({ success: true, views: [] });
|
||
assert.equal(await gone, 4);
|
||
api.deleteResult = Promise.reject(Object.assign(new Error('Locked'), { status: 500 }));
|
||
const failed = store.remove(4);
|
||
await flush();
|
||
pending[3].resolve({ success: true, views: [] });
|
||
await assert.rejects(failed, /Locked/);
|
||
api.patchResult = Promise.resolve({ success: true, view: null });
|
||
const invalid = store.rename(4, 'X');
|
||
await flush();
|
||
pending[4].resolve({ success: true, views: [] });
|
||
await assert.rejects(invalid, TypeError);
|
||
assert.equal(pending.length, 5);
|
||
assert.throws(() => store.rename(0, 'X'), TypeError);
|
||
assert.throws(() => store.remove('9'), TypeError);
|
||
});
|
||
|
||
test('a state over the API 4 KB cap is refused before anything is sent (#249 M5)', async () => {
|
||
const { createSavedViews, stateFits, SavedViewTooLarge, MAX_STATE_BYTES } = await source;
|
||
assert.equal(MAX_STATE_BYTES, 4096);
|
||
assert.equal(stateFits(IMAGE_DEFAULTS), true);
|
||
// Each value is within its own limit; their multibyte UTF-8 together passes 4 KB.
|
||
const big = { ...IMAGE_DEFAULTS, q: 'é'.repeat(500), folder: 'é'.repeat(1024), tags: Array.from({ length: 20 }, () => 'é'.repeat(50)) };
|
||
assert.equal(stateFits(big), false);
|
||
const { api } = fakeApi();
|
||
const store = createSavedViews(api);
|
||
await assert.rejects(store.create('images', 'Big', big), error => error instanceof SavedViewTooLarge && error instanceof RangeError);
|
||
assert.deepEqual(api.calls, []);
|
||
});
|