mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-10-05 23:05:10 +00:00
* feat(web): Schedule and General become ES-module pages (stage 3) Schedule and General follow stage 2 (#727): no inline scripts or inline handlers in either partial. Their code moves to static/v3/js/pages/schedule.js and pages/general.js, started per swap-in by the page registry. - Schedule: both pickers are drawn from the saved config carried as JSON in data-* attributes. The forms' hx-on save handlers become one htmx:afterRequest listener on the page; the forms are marked data-reports-result, which app.js now treats like an hx-on after-request handler, so a save still shows one notification. - General: the timezone picker reads data-timezone. The Security section's forms and buttons are delegated data-actions; requests go through core/api.js, so the login redirect is quiet, and a change made just before a swap is still reported. - handleScheduleResponse, handleDimScheduleResponse and webLogin stay as deprecated aliases through window.LEDMatrix. - New DOM suites test_schedule_page.js and test_general_page.js; the web login unit suite imports the module; test_es_modules.py pins the pages, the aliases, and the schedule config's round trip through its attribute. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(web): no unused catch bindings or computed writes in the stage 3 modules Codacy flagged two unused catch variables and dynamic-key writes in pages/schedule.js and boot.js. The schedule config is read with getAttribute, and the default days and the webLogin alias object are built with Object.fromEntries. No behaviour change. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
124 lines
6.2 KiB
JavaScript
124 lines
6.2 KiB
JavaScript
// The "restart the display" banner is raised by the server's answer, not by
|
|
// which URL was called.
|
|
//
|
|
// app.js used to show it after any successful POST to /api/v3/config/main and
|
|
// nothing else. A plugin update, install or uninstall that the running display
|
|
// cannot pick up live now answers `restart_required: true` (with the banner's
|
|
// wording in `restart_message`), and so does a main-config save. The htmx
|
|
// after-request handler and window.noteRestartRequired must both follow the
|
|
// flag. Runs the shipped app.js in a vm with a minimal fake DOM -- no jsdom and
|
|
// no server needed, so it runs under test/test_js_unit_suites.py too.
|
|
|
|
const fs = require('fs');
|
|
const path = require('path');
|
|
const vm = require('vm');
|
|
const V3 = path.resolve(__dirname, '../../../web_interface/static/v3');
|
|
|
|
let pass = 0, fail = 0;
|
|
const ok = (label, cond, extra) => cond
|
|
? (pass++, console.log(' ok ' + label))
|
|
: (fail++, console.log(' FAIL ' + label + (extra !== undefined ? ' ' + JSON.stringify(extra) : '')));
|
|
|
|
function load(notes) {
|
|
const handlers = {};
|
|
const listen = (target) => (type, fn) => { (handlers[target + ':' + type] ||= []).push(fn); };
|
|
const banner = { style: { display: 'none' } };
|
|
const text = { dataset: {}, textContent: ' Configuration saved — restart the display to apply the changes ' };
|
|
const store = {};
|
|
const document = {
|
|
body: { addEventListener: listen('body') },
|
|
addEventListener: listen('document'),
|
|
getElementById: (id) => ({ 'restart-pending-banner': banner, 'restart-pending-text': text })[id] || null,
|
|
querySelector: () => null,
|
|
querySelectorAll: () => [],
|
|
};
|
|
const window = {
|
|
addEventListener: listen('window'),
|
|
getApp: () => null,
|
|
};
|
|
const context = {
|
|
window, document, console,
|
|
sessionStorage: {
|
|
setItem: (k, v) => { store[k] = String(v); },
|
|
removeItem: (k) => { delete store[k]; },
|
|
getItem: (k) => (k in store ? store[k] : null),
|
|
},
|
|
showNotification: (m, t) => { if (notes) notes.push([m, t]); },
|
|
setTimeout: () => 0,
|
|
};
|
|
vm.createContext(context);
|
|
vm.runInContext(fs.readFileSync(path.join(V3, 'app.js'), 'utf8'), context);
|
|
const afterRequest = (handlers['body:htmx:afterRequest'] || [])[0];
|
|
// `marks`: the attribute selectors the requesting element (or its form)
|
|
// matches, for app.js's elt.closest(<selector list>).
|
|
const fire = ({ status = 200, body, path: reqPath = '/api/v3/anything', reportsItself = false, marks = [] }) => {
|
|
const elt = {
|
|
closest: (sel) => (reportsItself || sel.split(',').some(s => marks.includes(s.trim())) ? {} : null),
|
|
};
|
|
afterRequest({
|
|
target: { closest: () => null },
|
|
detail: {
|
|
xhr: { status, responseText: body === undefined ? '' : (typeof body === 'string' ? body : JSON.stringify(body)) },
|
|
elt,
|
|
requestConfig: { verb: 'post', path: reqPath },
|
|
},
|
|
});
|
|
};
|
|
return { window, banner, text, store, fire, afterRequest };
|
|
}
|
|
|
|
console.log('\nwindow.noteRestartRequired');
|
|
{
|
|
const t = load();
|
|
ok('app.js defines it', typeof t.window.noteRestartRequired === 'function');
|
|
ok('no flag, no banner', t.window.noteRestartRequired({ status: 'success' }) === false
|
|
&& t.banner.style.display === 'none');
|
|
ok('a missing body is ignored', t.window.noteRestartRequired(null) === false);
|
|
ok('restart_required: false is not a request',
|
|
t.window.noteRestartRequired({ restart_required: false }) === false && t.banner.style.display === 'none');
|
|
ok('restart_required: true shows the banner',
|
|
t.window.noteRestartRequired({ restart_required: true }) === true && t.banner.style.display === 'block');
|
|
ok('without a message the template wording stays',
|
|
t.text.textContent === 'Configuration saved — restart the display to apply the changes', t.text.textContent);
|
|
t.window.noteRestartRequired({ restart_required: true, restart_message: 'Plugin updated — restart the display to run the new version' });
|
|
ok('restart_message becomes the wording',
|
|
t.text.textContent === 'Plugin updated — restart the display to run the new version', t.text.textContent);
|
|
ok('and survives a reload with the flag', t.store['ledmatrix-restart-pending'] === '1'
|
|
&& t.store['ledmatrix-restart-pending-text'] === 'Plugin updated — restart the display to run the new version');
|
|
}
|
|
|
|
console.log('\nhtmx after-request follows the flag, not the URL');
|
|
{
|
|
const t = load();
|
|
ok('the handler is registered', typeof t.afterRequest === 'function');
|
|
t.fire({ path: '/api/v3/config/main', body: { status: 'success', message: 'Configuration saved successfully' } });
|
|
ok('a /config/main answer without the flag raises nothing', t.banner.style.display === 'none');
|
|
t.fire({ path: '/api/v3/plugins/update', status: 500, body: { status: 'error', restart_required: true } });
|
|
ok('an error answer never raises it', t.banner.style.display === 'none');
|
|
t.fire({ path: '/api/v3/whatever', body: '<html>not json' });
|
|
ok('a non-JSON answer is ignored', t.banner.style.display === 'none');
|
|
// The main-config forms report their own result (hx-on after-request), so
|
|
// the flag must be read even when the toast is not this handler's to show.
|
|
t.fire({ path: '/api/v3/config/main', reportsItself: true,
|
|
body: { status: 'success', message: 'Configuration saved successfully', restart_required: true } });
|
|
ok('a flagged answer raises it, even from a form that reports itself', t.banner.style.display === 'block');
|
|
}
|
|
|
|
console.log('\nthe server message toast');
|
|
{
|
|
const notes = [];
|
|
const t = load(notes);
|
|
const answer = { status: 'success', message: 'Schedule saved' };
|
|
t.fire({ body: answer });
|
|
ok('a plain htmx request shows the server message', notes.length === 1 && notes[0][0] === 'Schedule saved', notes);
|
|
t.fire({ body: answer, marks: ['[hx-on\\:htmx\\:after-request]'] });
|
|
ok('a form with its own hx-on after-request handler does not', notes.length === 1, notes);
|
|
// Page modules (js/pages/schedule.js) report a form's save from a listener
|
|
// and mark the form data-reports-result instead of an hx-on attribute.
|
|
t.fire({ body: answer, marks: ['[data-reports-result]'] });
|
|
ok('nor does a form a page module reports for (data-reports-result)', notes.length === 1, notes);
|
|
}
|
|
|
|
console.log(`\n${pass} passed, ${fail} failed`);
|
|
process.exit(fail ? 1 : 0);
|