Add canvas size disable controls
Publish Docker Image / build-and-push-existing-registry (./build/Dockerfile, web, pulse-signage-web) (push) Successful in 1m35s
Publish Docker Image / build-and-push-existing-registry (./build/Dockerfile.player, player, pulse-signage-player) (push) Successful in 59s

This commit is contained in:
lzstealth committed 2026-10-15 02:09:34 +01:00
1 parent 68e1f80190
commit f0601f823d
22 files changed
+205 -87

No files matched your search

+57 -20
View File
@@ -7,9 +7,10 @@ const path = require('node:path');
require('../src/common');
const { buildCanvasSizePayload, MAX_CANVAS_SIZE_DIMENSION } = require('../src/data');
const { fetchCanvasSizesData } = require('../src/data/canvas-sizes');
const { buildCanvasSizeFormViewModel } = require('../src/web/routes/signage/canvas-sizes/form-view-model');
const { buildDuplicateCanvasSizeName, buildDuplicateCanvasSize } = require('../src/web/routes/signage/canvas-sizes/duplicate');
const registerContentRoutes = require('../src/web/routes/admin/content');
const renderCanvasSizesPage = require('../src/web/routes/signage/canvas-sizes/list');
const adminPageScript = fs.readFileSync(require.resolve('../src/web/public/js/admin/admin-page.js'), 'utf8');
const canvasSizeFormTemplate = fs.readFileSync(require.resolve('../src/web/views/signage/canvas-sizes/form.hbs'), 'utf8');
const canvasSizeListTemplate = fs.readFileSync(require.resolve('../src/web/views/signage/canvas-sizes/list.hbs'), 'utf8');
@@ -40,23 +41,40 @@ test('canvas size edit form locks dimensions while the size is in use', () => {
assert.ok(canvasSizeFormTemplate.includes('data-limit-input-value'));
});
test('buildDuplicateCanvasSize copies canvas size fields for the create page', () => {
const duplicate = buildDuplicateCanvasSize({
id: 7,
name: 'Full HD',
width: 1920,
height: 1080
}, buildDuplicateCanvasSizeName('Full HD'));
assert.equal(duplicate.id, null);
assert.equal(duplicate.name, 'Copy of Full HD');
assert.equal(duplicate.width, 1920);
assert.equal(duplicate.height, 1080);
test('canvas size list replaces duplicate action with status and toggle controls', () => {
assert.doesNotMatch(canvasSizeListTemplate, /\/canvas-sizes\/\{\{id\}\}\/duplicate/);
assert.match(canvasSizeListTemplate, /data-label="Status"/);
assert.match(canvasSizeListTemplate, /\/canvas-sizes\/\{\{id\}\}\/toggle/);
assert.match(canvasSizeListTemplate, />\{\{#if enabled\}\}Disable\{\{else\}\}Enable\{\{\/if\}\}<\/button>/);
});
test('canvas size list template includes duplicate action', () => {
assert.match(canvasSizeListTemplate, /\/canvas-sizes\/\{\{id\}\}\/duplicate/);
assert.match(canvasSizeListTemplate, />Dupe<\/a>/);
test('canvas size list renderer preserves enabled state for status labels', () => {
const html = renderCanvasSizesPage({
canvasSizes: [
{ id: 1, name: 'Enabled size', width: 1920, height: 1080, enabled: 1, template_count: 0 },
{ id: 2, name: 'Disabled size', width: 1280, height: 720, enabled: 0, template_count: 0 }
]
}, '', null);
assert.match(html, /data-label="Status"><span class="badge text-bg-success">Enabled<\/span>/);
assert.match(html, /data-label="Status"><span class="badge text-bg-secondary">Disabled<\/span>/);
});
test('canvas-size selectors exclude disabled sizes unless retaining the current assignment', async () => {
const queries = [];
const pool = {
async query(sql, params) {
queries.push([sql, params]);
return [[]];
}
};
await fetchCanvasSizesData(pool);
await fetchCanvasSizesData(pool, 9);
assert.match(queries[0][0], /WHERE enabled = 1/);
assert.match(queries[1][0], /WHERE enabled = 1 OR id = \?/);
assert.deepEqual(queries[1][1], [9]);
});
test('canvas size update returns a warning when an in-use canvas changes dimensions', async () => {
@@ -71,11 +89,19 @@ test('canvas size update returns a warning when an in-use canvas changes dimensi
};
const queries = [];
const toggleUpdates = [];
const auditEvents = [];
let enabled = 1;
const pool = {
async query(sql) {
queries.push(sql);
async query(sql, params) {
queries.push([sql, params]);
if (sql.includes('UPDATE c_canvas_sizes SET enabled')) {
enabled = params[0];
toggleUpdates.push(params);
return [{ affectedRows: 1 }];
}
if (sql.includes('FROM c_canvas_sizes WHERE id = ?')) {
return [[{ id: 7, name: 'Full HD', width: 1920, height: 1080 }]];
return [[{ id: 7, name: 'Full HD', width: 1920, height: 1080, enabled: enabled }]];
}
if (sql.includes('SELECT COUNT(*) AS ref_count FROM c_templates WHERE canvas_size_id = ?')) {
return [[{ ref_count: 1 }]];
@@ -92,7 +118,7 @@ test('canvas size update returns a warning when an in-use canvas changes dimensi
getSortQuery: () => '',
getSortDirectionQuery: () => 'asc',
fetchCanvasSizeById: async (connection, id) => {
const [rows] = await connection.query('SELECT id, name, width, height, created_at, modified_at, created_by, modified_by FROM c_canvas_sizes WHERE id = ?', [id]);
const [rows] = await connection.query('SELECT id, name, width, height, enabled, created_at, modified_at, created_by, modified_by FROM c_canvas_sizes WHERE id = ?', [id]);
return rows[0] || null;
},
buildCanvasSizePayload: buildCanvasSizePayload,
@@ -124,6 +150,7 @@ test('canvas size update returns a warning when an in-use canvas changes dimensi
removeUnusedUploadFiles: async () => {},
syncPlaylistUploadsOnChange: async () => {},
getAuditUserId: () => 1,
recordRequestAuditEvent: async (_connection, _req, event) => auditEvents.push(event),
redirectAfterSave: () => {},
notifyPlayerScreens: async () => 0,
broadcastDashboardState: async () => {},
@@ -172,6 +199,16 @@ test('canvas size update returns a warning when an in-use canvas changes dimensi
assert.equal(res.body, 'This canvas size is still used by one or more templates, so its dimensions cannot be changed.');
assert.equal(res.redirectedTo, '');
assert.equal(queries.length, 2);
const toggleHandler = handlers['/canvas-sizes/:id/toggle'][1];
const toggleReq = { params: { id: '7' } };
const toggleRes = { redirectedTo: '', redirect(url) { this.redirectedTo = url; } };
await toggleHandler(toggleReq, toggleRes, (error) => { throw error; });
assert.equal(toggleRes.redirectedTo, '/canvas-sizes?message=Canvas%20size%20disabled.');
await toggleHandler(toggleReq, toggleRes, (error) => { throw error; });
assert.deepEqual(toggleUpdates.map((params) => params[0]), [0, 1]);
assert.deepEqual(auditEvents.map((event) => event.eventType), ['canvas-size.disabled', 'canvas-size.enabled']);
});
test('slide upload cleanup route removes pending media assets', async () => {