' +
'
Schedule ' +
'
Remove ' +
@@ -609,32 +823,37 @@
});
}
- if (addSlideButton && addSlideSelect) {
- addSlideButton.addEventListener('click', function () {
- var selectedOption = addSlideSelect.options[addSlideSelect.selectedIndex];
- if (!selectedOption || selectedOption.disabled) {
+ if (addSlideModal && addSlideGrid) {
+ renderSlidePicker();
+
+ addSlideGrid.addEventListener('click', function (event) {
+ var card = event.target.closest('.playlist-slide-picker-card');
+ if (!card) {
return;
}
- var placeholder = tbody.querySelector('.playlist-empty-row');
- if (placeholder) {
- placeholder.remove();
- }
- var row = createRow({
- row_key: 'new-' + Date.now(),
- slide_id: String(selectedOption.value),
- canvas_signature: String(selectedOption.getAttribute('data-canvas-signature') || ''),
- title: selectedOption.textContent || 'Slide',
- duration_seconds: 10,
- schedule_mode: 'always',
- schedule_start_datetime: '',
- schedule_end_datetime: '',
- schedule_start_time: '',
- schedule_end_time: '',
- schedule_days_json: '[]',
- summary: 'Always visible'
+ event.preventDefault();
+ toggleCardSelection(card);
+ });
+
+ if (addSlideSearch) {
+ addSlideSearch.addEventListener('input', syncSlidePickerState);
+ }
+
+ if (addSlideConfirm) {
+ addSlideConfirm.addEventListener('click', function () {
+ addSelectedSlides();
});
- tbody.appendChild(row);
- updateRowOrder(true);
+ }
+
+ addSlideModal.addEventListener('shown.bs.modal', function () {
+ syncSlidePickerState();
+ if (addSlideSearch) {
+ addSlideSearch.focus();
+ }
+ });
+
+ addSlideModal.addEventListener('hidden.bs.modal', function () {
+ clearModalSelection();
});
}
diff --git a/src/web/public/js/settings/background-tasks.js b/src/web/public/js/settings/background-tasks.js
index e610562..80ee5b9 100644
--- a/src/web/public/js/settings/background-tasks.js
+++ b/src/web/public/js/settings/background-tasks.js
@@ -8,6 +8,133 @@
return;
}
+ function getPageUrl(href) {
+ try {
+ return new URL(href, window.location.href);
+ } catch (_error) {
+ return null;
+ }
+ }
+
+ function updateLocalDateTimes(root) {
+ if (typeof window.initLocalDateTimes === 'function') {
+ window.initLocalDateTimes(root || document);
+ }
+ }
+
+ function replaceSectionFromDocument(sectionName, responseDocument) {
+ var currentCard = document.querySelector('[data-pagination-card="' + sectionName + '"]');
+ var nextCard = responseDocument.querySelector('[data-pagination-card="' + sectionName + '"]');
+
+ if (!currentCard || !nextCard) {
+ return false;
+ }
+
+ currentCard.outerHTML = nextCard.outerHTML;
+ updateLocalDateTimes(document.querySelector('[data-pagination-card="' + sectionName + '"]'));
+ return true;
+ }
+
+ function replaceSummaryFromDocument(responseDocument) {
+ var currentSummary = document.getElementById('background-tasks-summary');
+ var nextSummary = responseDocument.getElementById('background-tasks-summary');
+
+ if (!currentSummary || !nextSummary) {
+ return false;
+ }
+
+ currentSummary.outerHTML = nextSummary.outerHTML;
+ return true;
+ }
+
+ function replaceFiltersFromDocument(responseDocument) {
+ var currentFilters = document.getElementById('background-tasks-filters');
+ var nextFilters = responseDocument.getElementById('background-tasks-filters');
+
+ if (!currentFilters || !nextFilters) {
+ return false;
+ }
+
+ currentFilters.outerHTML = nextFilters.outerHTML;
+ return true;
+ }
+
+ function replaceStateFromDocument(responseDocument) {
+ var currentState = document.getElementById('background-tasks-state');
+ var nextState = responseDocument.getElementById('background-tasks-state');
+
+ if (!currentState || !nextState) {
+ return false;
+ }
+
+ currentState.outerHTML = nextState.outerHTML;
+ stateNode = document.getElementById('background-tasks-state');
+ currentVersion = stateNode ? String(stateNode.getAttribute('data-state-version') || '') : currentVersion;
+ return true;
+ }
+
+ function applyPageResponse(responseDocument, sectionNames) {
+ var updated = false;
+
+ if (replaceStateFromDocument(responseDocument)) {
+ updated = true;
+ }
+
+ if (replaceSummaryFromDocument(responseDocument)) {
+ updated = true;
+ }
+
+ if (replaceFiltersFromDocument(responseDocument)) {
+ updated = true;
+ }
+
+ sectionNames.forEach(function (sectionName) {
+ if (replaceSectionFromDocument(sectionName, responseDocument)) {
+ updated = true;
+ }
+ });
+
+ return updated;
+ }
+
+ function loadPage(nextUrl, options) {
+ var url = getPageUrl(nextUrl);
+ var sectionNames = options && options.sectionNames ? options.sectionNames : [];
+ var replaceHistory = Boolean(options && options.replaceHistory);
+
+ if (!url) {
+ return;
+ }
+
+ fetch(url.toString(), {
+ method: 'GET',
+ headers: {
+ 'Accept': 'text/html, application/xhtml+xml',
+ 'X-Requested-With': 'XMLHttpRequest'
+ },
+ credentials: 'same-origin',
+ cache: 'no-store'
+ }).then(function (response) {
+ if (!response.ok) {
+ throw new Error('Unable to load background tasks page.');
+ }
+ return response.text();
+ }).then(function (text) {
+ var responseDocument = new DOMParser().parseFromString(text || '', 'text/html');
+ if (!applyPageResponse(responseDocument, sectionNames.length ? sectionNames : ['tasks', 'recurring'])) {
+ return;
+ }
+
+ if (replaceHistory) {
+ window.history.replaceState({}, document.title, url.pathname + url.search + url.hash);
+ } else {
+ window.history.pushState({}, document.title, url.pathname + url.search + url.hash);
+ }
+ }).catch(function (_error) {
+ window.location.assign(url.pathname + url.search + url.hash);
+ });
+ }
+
function stripMessageParameter() {
try {
var url = new URL(window.location.href);
@@ -21,6 +148,100 @@
}
}
+ function findPaginationLink(target) {
+ if (!target || !target.closest) {
+ return null;
+ }
+
+ var link = target.closest('.pagination .page-link');
+ if (!link) {
+ return null;
+ }
+
+ var href = String(link.getAttribute('href') || '').trim();
+ if (!href || href === '#') {
+ return null;
+ }
+
+ var card = link.closest('[data-pagination-card]');
+ if (!card) {
+ return null;
+ }
+
+ return {
+ href: href,
+ sectionName: String(card.getAttribute('data-pagination-card') || '').trim()
+ };
+ }
+
+ function findFilterLink(target) {
+ if (!target || !target.closest) {
+ return null;
+ }
+
+ var link = target.closest('a[data-background-tasks-nav]');
+ if (!link) {
+ return null;
+ }
+
+ var href = String(link.getAttribute('href') || '').trim();
+ if (!href || href === '#') {
+ return null;
+ }
+
+ return {
+ href: href
+ };
+ }
+
+ function initPaginationNavigation() {
+ document.addEventListener('click', function (event) {
+ if (event.defaultPrevented || event.button !== 0 || event.metaKey || event.ctrlKey || event.shiftKey || event.altKey) {
+ return;
+ }
+
+ var paginationLink = findPaginationLink(event.target);
+ if (paginationLink && paginationLink.sectionName) {
+ var currentUrl = getPageUrl(window.location.href);
+ var nextUrl = getPageUrl(paginationLink.href);
+ if (!currentUrl || !nextUrl) {
+ return;
+ }
+
+ if (currentUrl.pathname === nextUrl.pathname && currentUrl.search === nextUrl.search && currentUrl.hash === nextUrl.hash) {
+ event.preventDefault();
+ return;
+ }
+
+ event.preventDefault();
+ loadPage(nextUrl.toString(), { sectionNames: [paginationLink.sectionName] });
+ return;
+ }
+
+ var filterLink = findFilterLink(event.target);
+ if (!filterLink) {
+ return;
+ }
+
+ var filterUrl = getPageUrl(filterLink.href);
+ if (!filterUrl) {
+ return;
+ }
+
+ if (filterUrl.pathname === window.location.pathname && filterUrl.search === window.location.search && filterUrl.hash === window.location.hash) {
+ event.preventDefault();
+ return;
+ }
+
+ event.preventDefault();
+ loadPage(filterUrl.toString(), { sectionNames: ['tasks'] });
+ }, true);
+
+ window.addEventListener('popstate', function () {
+ loadPage(window.location.href, { replaceHistory: true });
+ });
+ }
+
function refreshPage() {
if (document.visibilityState !== 'visible') {
return;
@@ -59,5 +280,6 @@
}
stripMessageParameter();
+ initPaginationNavigation();
window.setInterval(refreshPage, REFRESH_INTERVAL_MS);
}());
\ No newline at end of file
diff --git a/src/web/public/js/slide-form.js b/src/web/public/js/slide-form.js
index b895d7a..ac39b02 100644
--- a/src/web/public/js/slide-form.js
+++ b/src/web/public/js/slide-form.js
@@ -543,7 +543,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
if (!src) {
return '
Webpage
';
}
- return '
';
+ return '
';
}
function renderPreviewHtmlRegion(value) {
@@ -551,7 +551,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
if (!html) {
return '
HTML
';
}
- return '
';
+ return '
';
}
function destroyEditors() {
diff --git a/src/web/public/js/slides/slide-form.js b/src/web/public/js/slides/slide-form.js
index 6301c94..c1986f3 100644
--- a/src/web/public/js/slides/slide-form.js
+++ b/src/web/public/js/slides/slide-form.js
@@ -67,6 +67,34 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
var sidebarTopOffset = 16;
var templateSelectorLock = createTemplateSelectorLockController(templateSelect);
+ function applyBackdropStyle(element, backgroundColor, backgroundImagePath) {
+ if (!element) {
+ return;
+ }
+
+ var color = String(backgroundColor || '#111111').trim() || '#111111';
+ element.style.backgroundColor = color;
+ element.style.backgroundImage = backgroundImagePath
+ ? 'linear-gradient(rgba(0, 0, 0, 0.42), rgba(0, 0, 0, 0.42)), url("' + encodeURI(String(backgroundImagePath)) + '")'
+ : 'linear-gradient(rgba(0, 0, 0, 0.42), rgba(0, 0, 0, 0.42))';
+ element.style.backgroundPosition = backgroundImagePath ? 'center, center' : 'center';
+ element.style.backgroundSize = backgroundImagePath ? '100% 100%, cover' : '100% 100%';
+ element.style.backgroundRepeat = backgroundImagePath ? 'no-repeat, no-repeat' : 'no-repeat';
+ }
+
+ function applyPopupBackdropStyle(element, backgroundColor) {
+ if (!element) {
+ return;
+ }
+
+ var color = String(backgroundColor || '#111111').trim() || '#111111';
+ element.style.backgroundColor = color;
+ element.style.backgroundImage = 'linear-gradient(rgba(0, 0, 0, 0.42), rgba(0, 0, 0, 0.42))';
+ element.style.backgroundPosition = 'center';
+ element.style.backgroundSize = '100% 100%';
+ element.style.backgroundRepeat = 'no-repeat';
+ }
+
class FontSizeInputUI extends Plugin {
static get pluginName() {
return 'FontSizeInputUI';
@@ -408,7 +436,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
if (!src) {
return '
Webpage
';
}
- return '
';
+ return '
';
}
function renderPreviewRtmpRegion(value, disableAudio) {
@@ -425,7 +453,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
if (!html) {
return '
HTML
';
}
- return '
';
+ return '
';
}
function destroyEditors() {
@@ -814,7 +842,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
}
if (!template) {
- popupStage.style.backgroundColor = '#111111';
+ applyBackdropStyle(popupCanvas, '#111111');
popupCanvas.style.width = '';
popupCanvas.style.height = '';
popupCanvas.style.transform = '';
@@ -837,7 +865,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
var canvasWidth = currentPreviewCanvasWidth || Math.max(1, Number(template.canvas_size_width || 1920));
var canvasHeight = currentPreviewCanvasHeight || Math.max(1, Number(template.canvas_size_height || 1080));
- popupStage.style.backgroundColor = template.background_color || '#111111';
+ applyBackdropStyle(popupCanvas, template.background_color || '#111111', template.background_image_path);
popupCanvas.style.width = canvasWidth + 'px';
popupCanvas.style.height = canvasHeight + 'px';
popupCanvas.innerHTML = slidePreviewCanvas.innerHTML;
@@ -949,7 +977,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
slidePreviewOverlay.style.height = '';
slidePreviewOverlay.style.transform = '';
slidePreviewStage.style.aspectRatio = '16 / 9';
- slidePreviewStage.style.backgroundColor = '#111111';
+ applyBackdropStyle(slidePreviewStage, '#111111');
return;
}
@@ -959,7 +987,7 @@ import { createTemplateSelectorLockController } from '/assets/js/slides/slide-fo
currentPreviewCanvasWidth = canvasWidth;
currentPreviewCanvasHeight = canvasHeight;
slidePreviewStage.style.aspectRatio = canvasWidth + ' / ' + canvasHeight;
- slidePreviewStage.style.backgroundColor = template.background_color || '#111111';
+ applyBackdropStyle(slidePreviewStage, template.background_color || '#111111', template.background_image_path);
slidePreviewMeta.textContent = canvasWidth + 'x' + canvasHeight;
if (!(template.regions || []).length) {
slidePreviewEmpty.style.display = 'flex';
diff --git a/src/web/public/js/templates/template-designer.js b/src/web/public/js/templates/template-designer.js
index 070a437..2dfc36e 100644
--- a/src/web/public/js/templates/template-designer.js
+++ b/src/web/public/js/templates/template-designer.js
@@ -528,10 +528,10 @@
}
function openAddRegionModal() {
- if (!regionAddModal || !window.bootstrap || !window.bootstrap.Modal) {
+ if (!window.pulseModal) {
return;
}
- window.bootstrap.Modal.getOrCreateInstance(regionAddModal).show();
+ window.pulseModal.show(regionAddModal);
}
function createDefaultRegion(type) {
@@ -701,8 +701,8 @@
button.addEventListener('click', function () {
var regionType = button.getAttribute('data-add-region-type');
addRegion(createDefaultRegion(regionType));
- if (window.bootstrap && window.bootstrap.Modal) {
- window.bootstrap.Modal.getOrCreateInstance(regionAddModal).hide();
+ if (window.pulseModal) {
+ window.pulseModal.hide(regionAddModal);
}
});
});
diff --git a/src/web/routes/admin/content.js b/src/web/routes/admin/content.js
index fe415a5..0f83a62 100644
--- a/src/web/routes/admin/content.js
+++ b/src/web/routes/admin/content.js
@@ -13,15 +13,37 @@ module.exports = function registerAdminContentRoutes(app, deps) {
const redirectAfterSave = deps.redirectAfterSave;
const notifyPlayerScreens = deps.notifyPlayerScreens;
const broadcastDashboardState = deps.broadcastDashboardState;
+ const backgroundTaskQueue = deps.backgroundTaskQueue;
const getSlideDeleteBlockMessage = deps.getSlideDeleteBlockMessage;
const getTemplateDeleteBlockMessage = deps.getTemplateDeleteBlockMessage;
const getCanvasSizeDeleteBlockMessage = deps.getCanvasSizeDeleteBlockMessage;
const requirePermission = deps.requirePermission;
+ const { buildPagination } = require('../../lib/pagination');
+
+ const LIST_PAGE_SIZE = 10;
if (!pool || !common || !pages || !upload || typeof fetchScreensBySlideId !== 'function' || typeof fetchScreensByTemplateId !== 'function' || typeof collectUploadReferencesFromSlide !== 'function' || typeof collectUploadReferencesFromTemplate !== 'function' || typeof collectUploadReferencesFromPayload !== 'function' || typeof syncPlaylistUploadsOnChange !== 'function' || typeof getAuditUserId !== 'function' || typeof redirectAfterSave !== 'function' || typeof notifyPlayerScreens !== 'function' || typeof broadcastDashboardState !== 'function' || typeof getSlideDeleteBlockMessage !== 'function' || typeof getTemplateDeleteBlockMessage !== 'function' || typeof getCanvasSizeDeleteBlockMessage !== 'function') {
throw new Error('registerAdminContentRoutes requires the content route dependencies.');
}
+ function queueSlideThumbnailRefresh(slideId, previousThumbnailPath) {
+ if (!backgroundTaskQueue || typeof backgroundTaskQueue.enqueueTask !== 'function') {
+ return Promise.resolve(null);
+ }
+
+ return backgroundTaskQueue.enqueueTask({
+ key: 'slide-thumbnail:' + Number(slideId),
+ title: 'Refresh slide thumbnail',
+ category: 'slides',
+ taskType: 'slide-thumbnail-refresh',
+ payload: {
+ slideId: Number(slideId),
+ previousThumbnailPath: String(previousThumbnailPath || '').trim()
+ },
+ persist: true
+ });
+ }
+
async function canvasSizeExists(width, height, ignoreId) {
const params = [width, height];
let query = 'SELECT COUNT(*) AS count FROM canvas_sizes WHERE width = ? AND height = ?';
@@ -58,8 +80,12 @@ module.exports = function registerAdminContentRoutes(app, deps) {
app.get('/slides', requirePermission('slides.read'), async function (req, res, next) {
try {
- const data = await common.fetchAdminData(pool);
- res.send(pages.renderSlidesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchSlidesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderSlidesPage({
+ slides: data.slides || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'slides', 'Slide pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
@@ -136,6 +162,9 @@ module.exports = function registerAdminContentRoutes(app, deps) {
localUploadDir: deps.uploadDir,
nextUploadRefs: collectUploadReferencesFromPayload(payload)
});
+ queueSlideThumbnailRefresh(result.insertId, null).catch(function (error) {
+ console.warn('Unable to queue slide thumbnail refresh:', error);
+ });
redirectAfterSave(req, res, '/slides/' + result.insertId + '/edit', {
closeUrl: '/slides',
newUrl: '/slides/new',
@@ -176,6 +205,9 @@ module.exports = function registerAdminContentRoutes(app, deps) {
screenSlideCounts: screenSlideCounts
});
await broadcastDashboardState();
+ queueSlideThumbnailRefresh(slide.id, slide.thumbnail_path).catch(function (error) {
+ console.warn('Unable to queue slide thumbnail refresh:', error);
+ });
redirectAfterSave(req, res, '/slides/' + slide.id + '/edit', {
closeUrl: '/slides',
newUrl: '/slides/new',
@@ -218,8 +250,12 @@ module.exports = function registerAdminContentRoutes(app, deps) {
app.get('/templates', requirePermission('templates.read'), async function (req, res, next) {
try {
- const data = await common.fetchTemplatesData(pool);
- res.send(pages.renderTemplatesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchTemplatesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderTemplatesPage({
+ templates: data.templates || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'templates', 'Template pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
@@ -355,8 +391,12 @@ module.exports = function registerAdminContentRoutes(app, deps) {
app.get('/canvas-sizes', requirePermission('canvas-sizes.read'), async function (req, res, next) {
try {
- const data = await common.fetchAdminData(pool);
- res.send(pages.renderCanvasSizesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchCanvasSizesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderCanvasSizesPage({
+ canvasSizes: data.canvasSizes || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'canvas sizes', 'Canvas size pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/admin/data-sources.js b/src/web/routes/admin/data-sources.js
index 85de715..f232ae5 100644
--- a/src/web/routes/admin/data-sources.js
+++ b/src/web/routes/admin/data-sources.js
@@ -13,6 +13,9 @@ module.exports = function registerAdminDataSourceRoutes(app, deps) {
const fetchRssFeedItems = deps.fetchRssFeedItems || (common && common.fetchRssFeedItems) || null;
const replaceRssFeedItems = deps.replaceRssFeedItems || (common && common.replaceRssFeedItems) || null;
const fetchApiSourceResponse = common && common.fetchApiSourceResponse ? common.fetchApiSourceResponse : null;
+ const { buildPagination } = require('../../lib/pagination');
+
+ const LIST_PAGE_SIZE = 10;
function toIsoTimestamp(value) {
if (!value) {
@@ -195,8 +198,21 @@ module.exports = function registerAdminDataSourceRoutes(app, deps) {
app.get('/data-sources/api-sources', requirePermission('api-sources.read'), async function (req, res, next) {
try {
- const data = await common.fetchApiSourcesData(pool);
- res.send(pages.renderApiSourcesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser, formatDashboardDate));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchApiSourcesPage(pool, page, LIST_PAGE_SIZE);
+ const apiSources = (data.apiSources || []).map(function (apiSource) {
+ return Object.assign({}, apiSource, {
+ intervalLabel: apiSource.update_interval_unit === 'seconds'
+ ? (Math.max(1, Number(apiSource.update_interval_value) || 0) === 1 ? 'Every second' : `Every ${Math.max(1, Number(apiSource.update_interval_value) || 0)} seconds`)
+ : (Math.max(1, Number(apiSource.update_interval_value) || 0) === 1 ? 'Every minute' : `Every ${Math.max(1, Number(apiSource.update_interval_value) || 0)} minutes`),
+ lastPullLabel: apiSource.last_pulled_at ? formatDashboardDate(apiSource.last_pulled_at) : 'Never',
+ lastPulledAtValue: apiSource.last_pulled_at ? new Date(apiSource.last_pulled_at).toISOString() : ''
+ });
+ });
+ res.send(pages.renderApiSourcesPage({
+ apiSources: apiSources,
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'API sources', 'API source pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser, formatDashboardDate));
} catch (error) {
next(error);
}
@@ -364,8 +380,12 @@ module.exports = function registerAdminDataSourceRoutes(app, deps) {
app.get('/data-sources/rss-feeds', requirePermission('rss-feeds.read'), async function (req, res, next) {
try {
- const data = await common.fetchRssFeedsData(pool);
- res.send(pages.renderRssFeedsPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchRssFeedsPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderRssFeedsPage({
+ rssFeeds: data.rssFeeds || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'RSS feeds', 'RSS feed pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/admin/manage.js b/src/web/routes/admin/manage.js
index a90cf4a..9e15288 100644
--- a/src/web/routes/admin/manage.js
+++ b/src/web/routes/admin/manage.js
@@ -76,6 +76,7 @@ module.exports = function registerAdminManageRoutes(app, deps) {
try {
const name = String(req.body.name || '').trim();
const fadeBetweenSlides = req.body.fade_between_slides ? 1 : 0;
+ const skipUnavailableRtmp = req.body.skip_unavailable_rtmp ? 1 : 0;
if (!name) {
return res.status(400).send('Playlist name is required.');
}
@@ -83,7 +84,7 @@ module.exports = function registerAdminManageRoutes(app, deps) {
return res.status(400).send('A playlist with that name already exists.');
}
const actorId = getAuditUserId(req);
- const [result] = await pool.query('INSERT INTO playlists (name, fade_between_slides, created_by, modified_by) VALUES (?, ?, ?, ?)', [name, fadeBetweenSlides, actorId, actorId]);
+ const [result] = await pool.query('INSERT INTO playlists (name, fade_between_slides, skip_unavailable_rtmp, created_by, modified_by) VALUES (?, ?, ?, ?, ?)', [name, fadeBetweenSlides, skipUnavailableRtmp, actorId, actorId]);
redirectAfterSave(req, res, '/playlists?edit=' + result.insertId, {
closeUrl: '/playlists',
newUrl: '/playlists/new',
@@ -99,6 +100,7 @@ module.exports = function registerAdminManageRoutes(app, deps) {
try {
const name = String(req.body.name || '').trim();
const fadeBetweenSlides = req.body.fade_between_slides ? 1 : 0;
+ const skipUnavailableRtmp = req.body.skip_unavailable_rtmp ? 1 : 0;
if (!name) {
return res.status(400).send('Playlist name is required.');
}
@@ -220,7 +222,7 @@ module.exports = function registerAdminManageRoutes(app, deps) {
const actorId = getAuditUserId(req);
await connection.beginTransaction();
- await connection.query('UPDATE playlists SET name = ?, fade_between_slides = ?, modified_by = ? WHERE id = ?', [name, fadeBetweenSlides, actorId, playlist.id]);
+ await connection.query('UPDATE playlists SET name = ?, fade_between_slides = ?, skip_unavailable_rtmp = ?, modified_by = ? WHERE id = ?', [name, fadeBetweenSlides, skipUnavailableRtmp, actorId, playlist.id]);
await connection.query('DELETE FROM playlist_slides WHERE playlist_id = ?', [playlist.id]);
for (let i = 0; i < normalizedSlides.length; i += 1) {
const item = normalizedSlides[i];
diff --git a/src/web/routes/admin/rbac.js b/src/web/routes/admin/rbac.js
index 14a6a02..fd236e3 100644
--- a/src/web/routes/admin/rbac.js
+++ b/src/web/routes/admin/rbac.js
@@ -7,8 +7,11 @@ module.exports = function registerAdminRbacRoutes(app, deps) {
const permissions = Array.isArray(deps.permissions) ? deps.permissions : [];
const readArrayField = deps.readArrayField;
const normalizePermissionKeys = deps.normalizePermissionKeys;
+ const { buildPagination } = require('../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
function slugifyRoleKey(name) {
const value = String(name || '').trim().toLowerCase();
const slug = value.replace(/[^a-z0-9]+/g, '-').replace(/^-+|-+$/g, '');
@@ -158,8 +161,12 @@ module.exports = function registerAdminRbacRoutes(app, deps) {
app.get('/rbac', requirePermission('rbac.read'), async function (req, res, next) {
try {
- const roles = await rbacData.fetchRoles(pool);
- res.send(pages.renderRbacPage({ roles: roles }, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await rbacData.fetchRolesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderRbacPage({
+ roles: data.roles || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'roles', 'Role pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/admin/users.js b/src/web/routes/admin/users.js
index 6bc3e0a..9a4ed2e 100644
--- a/src/web/routes/admin/users.js
+++ b/src/web/routes/admin/users.js
@@ -7,8 +7,11 @@ module.exports = function registerAdminUsersRoutes(app, deps) {
const hashPassword = deps.hashPassword;
const readArrayField = deps.readArrayField;
const rbacData = deps.rbacData;
+ const { buildPagination } = require('../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
async function fetchRoleOptions() {
return rbacData.fetchRoles(pool);
}
@@ -53,8 +56,9 @@ module.exports = function registerAdminUsersRoutes(app, deps) {
app.get('/users', requirePermission('users.read'), async function (req, res, next) {
try {
- const users = await rbacData.fetchUsersWithRoles(pool);
- const mappedUsers = users.map(function (user) {
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await rbacData.fetchUsersWithRolesPage(pool, page, LIST_PAGE_SIZE);
+ const mappedUsers = (data.users || []).map(function (user) {
return Object.assign({}, user, {
isCurrentUser: Number(user.id) === Number(req.currentUser.id),
createdAtLabel: formatDashboardDate(user.created_at),
@@ -62,7 +66,10 @@ module.exports = function registerAdminUsersRoutes(app, deps) {
roleNames: String(user.roleNames || '').trim() || 'No roles assigned'
});
});
- res.send(pages.renderUsersPage({ users: mappedUsers }, req.query.message ? String(req.query.message) : '', req.currentUser));
+ res.send(pages.renderUsersPage({
+ users: mappedUsers,
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'users', 'Users pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/data-sources/api-sources/list.js b/src/web/routes/data-sources/api-sources/list.js
index 45ff6c1..f9011c9 100644
--- a/src/web/routes/data-sources/api-sources/list.js
+++ b/src/web/routes/data-sources/api-sources/list.js
@@ -43,6 +43,7 @@ module.exports = function renderApiSourcesPage(data, message, currentUser, forma
active: 'api-sources',
message: message,
currentUser: currentUser || null,
- apiSources: apiSources
+ apiSources: apiSources,
+ pagination: data.pagination || null
});
};
\ No newline at end of file
diff --git a/src/web/routes/data-sources/rss-feeds/list.js b/src/web/routes/data-sources/rss-feeds/list.js
index 0bec437..e8fdcf2 100644
--- a/src/web/routes/data-sources/rss-feeds/list.js
+++ b/src/web/routes/data-sources/rss-feeds/list.js
@@ -27,6 +27,7 @@ module.exports = function renderRssFeedsPage(data, message, currentUser) {
active: 'rss-feeds',
message: message,
currentUser: currentUser || null,
- rssFeeds: rssFeeds
+ rssFeeds: rssFeeds,
+ pagination: data.pagination || null
});
};
\ No newline at end of file
diff --git a/src/web/routes/settings/background-tasks-page.js b/src/web/routes/settings/background-tasks-page.js
index fc83780..57ab515 100644
--- a/src/web/routes/settings/background-tasks-page.js
+++ b/src/web/routes/settings/background-tasks-page.js
@@ -2,6 +2,7 @@ const { renderView } = require('../../view');
const { hasAnyPermission } = require('../../../rbac');
const TASKS_PER_PAGE = 10;
+const TASK_STATUSES = new Set(['queued', 'running', 'failed', 'completed', 'canceled']);
function formatIntervalLabel(intervalMs) {
const value = Math.max(1, Number(intervalMs) || 0);
@@ -21,7 +22,40 @@ function parsePageNumber(value) {
return Math.max(1, pageNumber);
}
-function buildPagination(totalItems, currentPage, pageParam) {
+function normalizeStatusFilter(value) {
+ const status = String(value || '').trim().toLowerCase();
+ return TASK_STATUSES.has(status) ? status : '';
+}
+
+function normalizeSourceFilter(sourceType, sourceId) {
+ const normalizedSourceType = String(sourceType || '').trim();
+ const normalizedSourceId = Math.floor(Number(sourceId) || 0);
+
+ if (!normalizedSourceType || !Number.isFinite(normalizedSourceId) || normalizedSourceId <= 0) {
+ return { sourceType: '', sourceId: '' };
+ }
+
+ return {
+ sourceType: normalizedSourceType,
+ sourceId: normalizedSourceId
+ };
+}
+
+function buildQueryString(query) {
+ const searchParams = new URLSearchParams();
+ ['page', 'recurringPage', 'status', 'sourceType', 'sourceId'].forEach(function (key) {
+ const value = query && query[key];
+ if (value === undefined || value === null || value === '') {
+ return;
+ }
+ searchParams.set(key, String(value));
+ });
+
+ const queryString = searchParams.toString();
+ return queryString ? `?${queryString}` : '';
+}
+
+function buildPagination(totalItems, currentPage, pageParam, queryState) {
const normalizedPageParam = String(pageParam || 'page').trim() || 'page';
const totalPages = Math.max(1, Math.ceil(totalItems / TASKS_PER_PAGE));
const safeCurrentPage = Math.min(Math.max(1, currentPage), totalPages);
@@ -30,13 +64,17 @@ function buildPagination(totalItems, currentPage, pageParam) {
const pages = [];
for (let pageNumber = 1; pageNumber <= totalPages; pageNumber += 1) {
+ const nextQuery = Object.assign({}, queryState, { [normalizedPageParam]: pageNumber });
pages.push({
number: pageNumber,
active: pageNumber === safeCurrentPage,
- url: `?${normalizedPageParam}=${pageNumber}`
+ url: buildQueryString(nextQuery)
});
}
+ const previousQuery = Object.assign({}, queryState, { [normalizedPageParam]: safeCurrentPage - 1 });
+ const nextQuery = Object.assign({}, queryState, { [normalizedPageParam]: safeCurrentPage + 1 });
+
return {
currentPage: safeCurrentPage,
totalPages: totalPages,
@@ -46,23 +84,139 @@ function buildPagination(totalItems, currentPage, pageParam) {
endItem: endIndex,
hasPrevious: safeCurrentPage > 1,
hasNext: safeCurrentPage < totalPages,
- previousUrl: `?${normalizedPageParam}=${safeCurrentPage - 1}`,
- nextUrl: `?${normalizedPageParam}=${safeCurrentPage + 1}`,
+ previousUrl: buildQueryString(previousQuery),
+ nextUrl: buildQueryString(nextQuery),
pages: pages,
pageSize: TASKS_PER_PAGE,
pageParam: normalizedPageParam
};
}
+function taskMatchesFilters(task, statusFilter, sourceFilter) {
+ if (statusFilter && task.status !== statusFilter) {
+ return false;
+ }
+
+ if (!sourceFilter || !sourceFilter.sourceType || !sourceFilter.sourceId) {
+ return true;
+ }
+
+ const metadata = task.metadata || {};
+ return String(metadata.sourceType || '').trim() === sourceFilter.sourceType && Number(metadata.sourceId || 0) === sourceFilter.sourceId;
+}
+
+function formatStatusLabel(status) {
+ const normalizedStatus = String(status || '').trim().toLowerCase();
+ if (!normalizedStatus) {
+ return 'All tasks';
+ }
+
+ return normalizedStatus.charAt(0).toUpperCase() + normalizedStatus.slice(1);
+}
+
+function buildTaskSourceFilterUrl(queryState, task, sourceFilter) {
+ const metadata = task.metadata || {};
+ const sourceType = String(metadata.sourceType || '').trim();
+ const sourceId = Math.floor(Number(metadata.sourceId) || 0);
+
+ if (!sourceType || !Number.isFinite(sourceId) || sourceId <= 0) {
+ return '';
+ }
+
+ const isActive = sourceFilter && sourceFilter.sourceType === sourceType && sourceFilter.sourceId === sourceId;
+ const nextQuery = Object.assign({}, queryState, {
+ page: 1,
+ sourceType: isActive ? '' : sourceType,
+ sourceId: isActive ? '' : sourceId
+ });
+
+ return buildQueryString(nextQuery);
+}
+
+function buildStatusFilterUrl(queryState, statusFilter) {
+ const nextQuery = Object.assign({}, queryState, {
+ page: 1,
+ status: statusFilter && statusFilter.status === statusFilter.targetStatus ? '' : statusFilter.targetStatus,
+ sourceType: statusFilter && statusFilter.sourceType ? statusFilter.sourceType : '',
+ sourceId: statusFilter && statusFilter.sourceId ? statusFilter.sourceId : ''
+ });
+
+ return buildQueryString(nextQuery);
+}
+
module.exports = function renderBackgroundTasksPage(data, message, currentUser) {
const tasks = (data && data.tasks) || [];
const recurringTasks = (data && data.recurringTasks) || [];
const summary = (data && data.summary) || { counts: {}, total: 0, activeCount: 0 };
const canManage = hasAnyPermission(currentUser, ['background-tasks.allow']);
- const pagination = buildPagination(tasks.length, parsePageNumber(data && data.page), 'page');
- const recurringPagination = buildPagination(recurringTasks.length, parsePageNumber(data && data.recurringPage), 'recurringPage');
- const visibleTasks = tasks.slice((pagination.currentPage - 1) * TASKS_PER_PAGE, pagination.currentPage * TASKS_PER_PAGE);
+ const queryState = {
+ page: parsePageNumber(data && data.page),
+ recurringPage: parsePageNumber(data && data.recurringPage),
+ status: normalizeStatusFilter(data && data.status),
+ sourceType: '',
+ sourceId: ''
+ };
+ const sourceFilter = normalizeSourceFilter(data && data.sourceType, data && data.sourceId);
+ queryState.status = normalizeStatusFilter(data && data.status);
+ queryState.sourceType = sourceFilter.sourceType;
+ queryState.sourceId = sourceFilter.sourceId;
+ const filteredTasks = tasks.filter(function (task) {
+ return taskMatchesFilters(task, queryState.status, sourceFilter);
+ });
+ const pagination = buildPagination(filteredTasks.length, queryState.page, 'page', queryState);
+ const recurringPagination = buildPagination(recurringTasks.length, queryState.recurringPage, 'recurringPage', queryState);
+ const visibleTasks = filteredTasks.slice((pagination.currentPage - 1) * TASKS_PER_PAGE, pagination.currentPage * TASKS_PER_PAGE);
const visibleRecurringTasks = recurringTasks.slice((recurringPagination.currentPage - 1) * TASKS_PER_PAGE, recurringPagination.currentPage * TASKS_PER_PAGE);
+ const statusCards = [
+ {
+ status: 'queued',
+ label: 'Queued',
+ count: summary.counts.queued,
+ variant: 'primary'
+ },
+ {
+ status: 'running',
+ label: 'Running',
+ count: summary.counts.running,
+ variant: 'info'
+ },
+ {
+ status: 'failed',
+ label: 'Failed',
+ count: summary.counts.failed,
+ variant: 'danger'
+ },
+ {
+ status: 'completed',
+ label: 'Finished',
+ count: summary.counts.completed,
+ variant: 'success'
+ }
+ ].map(function (card) {
+ const isActive = queryState.status === card.status;
+ const statusFilter = {
+ status: queryState.status,
+ sourceType: queryState.sourceType,
+ sourceId: queryState.sourceId,
+ targetStatus: card.status
+ };
+
+ return Object.assign({}, card, {
+ active: isActive,
+ href: buildStatusFilterUrl(queryState, statusFilter),
+ ariaLabel: isActive ? `Clear ${card.label.toLowerCase()} filter` : `Filter tasks by ${card.label.toLowerCase()}`
+ });
+ });
+
+ const visibleTasksWithSources = visibleTasks.map(function (task) {
+ return Object.assign({}, task, {
+ sourceUrl: buildTaskSourceFilterUrl(queryState, task, sourceFilter),
+ sourceLabel: task.metadata && task.metadata.sourceName ? String(task.metadata.sourceName).trim() : '',
+ sourceTypeLabel: task.metadata && task.metadata.sourceType ? String(task.metadata.sourceType).trim() : '',
+ sourceIdLabel: task.metadata && task.metadata.sourceId ? Number(task.metadata.sourceId) : ''
+ });
+ });
+ const hasActiveFilters = Boolean(queryState.status || queryState.sourceType || queryState.sourceId);
return renderView('settings/background-tasks/index', {
title: 'Background tasks',
@@ -71,13 +225,18 @@ module.exports = function renderBackgroundTasksPage(data, message, currentUser)
currentUser: currentUser || null,
scripts: ['js/settings/background-tasks.js'],
stateVersion: data && data.stateVersion ? String(data.stateVersion) : '',
- tasks: visibleTasks,
+ tasks: visibleTasksWithSources,
recurringTasks: visibleRecurringTasks.map(function (task) {
return Object.assign({}, task, {
intervalLabel: formatIntervalLabel(task.intervalMs)
});
}),
summary: summary,
+ statusCards: statusCards,
+ activeStatusLabel: formatStatusLabel(queryState.status),
+ activeSourceLabel: queryState.sourceType && queryState.sourceId ? `${queryState.sourceType} #${queryState.sourceId}` : '',
+ clearFiltersUrl: buildQueryString({ recurringPage: queryState.recurringPage }),
+ hasActiveFilters: hasActiveFilters,
pagination: pagination,
recurringPagination: recurringPagination,
canManage: canManage,
diff --git a/src/web/routes/settings/rbac/list.js b/src/web/routes/settings/rbac/list.js
index 6fd7186..f691e12 100644
--- a/src/web/routes/settings/rbac/list.js
+++ b/src/web/routes/settings/rbac/list.js
@@ -6,6 +6,7 @@ module.exports = function renderRbacPage(data, message, currentUser) {
active: 'rbac',
message: message,
currentUser: currentUser || null,
- roles: data.roles || []
+ roles: data.roles || [],
+ pagination: data.pagination || null
});
};
\ No newline at end of file
diff --git a/src/web/routes/settings/users/list.js b/src/web/routes/settings/users/list.js
index ca1ec7b..80a5979 100644
--- a/src/web/routes/settings/users/list.js
+++ b/src/web/routes/settings/users/list.js
@@ -6,6 +6,7 @@ module.exports = function renderUsersPage(data, message, currentUser) {
active: 'users',
message: message,
currentUser: currentUser || null,
- users: data.users || []
+ users: data.users || [],
+ pagination: data.pagination || null
});
};
\ No newline at end of file
diff --git a/src/web/routes/signage/canvas-sizes/list.js b/src/web/routes/signage/canvas-sizes/list.js
index 5c54e4b..bf67317 100644
--- a/src/web/routes/signage/canvas-sizes/list.js
+++ b/src/web/routes/signage/canvas-sizes/list.js
@@ -6,7 +6,9 @@ module.exports = function renderCanvasSizesPage(data, message, currentUser) {
name: size.name,
width: size.width,
height: size.height,
- templateCount: (data.templates || []).filter((template) => Number(template.canvas_size_id) === Number(size.id)).length
+ templateCount: size.template_count !== undefined
+ ? Number(size.template_count) || 0
+ : (data.templates || []).filter((template) => Number(template.canvas_size_id) === Number(size.id)).length
}));
return renderView('canvas-sizes/list', {
@@ -14,6 +16,7 @@ module.exports = function renderCanvasSizesPage(data, message, currentUser) {
active: 'canvas-sizes',
message: message,
currentUser: currentUser || null,
- canvasSizes: canvasSizes
+ canvasSizes: canvasSizes,
+ pagination: data.pagination || null
});
};
diff --git a/src/web/routes/signage/canvas-sizes/routes.js b/src/web/routes/signage/canvas-sizes/routes.js
index 5265483..9ef7f93 100644
--- a/src/web/routes/signage/canvas-sizes/routes.js
+++ b/src/web/routes/signage/canvas-sizes/routes.js
@@ -2,12 +2,19 @@ module.exports = function registerCanvasSizeRoutes(app, deps) {
const pages = deps.pages;
const common = deps.common;
const pool = deps.pool;
+ const { buildPagination } = require('../../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
app.get('/canvas-sizes', requirePermission('canvas-sizes.read'), async function (req, res, next) {
try {
- const data = await common.fetchCanvasSizesData(pool);
- res.send(pages.renderCanvasSizesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchCanvasSizesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderCanvasSizesPage({
+ canvasSizes: data.canvasSizes || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'canvas sizes', 'Canvas size pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/signage/clients/list.js b/src/web/routes/signage/clients/list.js
index fb58b3a..24b4f7d 100644
--- a/src/web/routes/signage/clients/list.js
+++ b/src/web/routes/signage/clients/list.js
@@ -7,6 +7,7 @@ module.exports = function renderConnectedClientsPage(data, message, currentUser)
message: message,
currentUser: currentUser || null,
scripts: ['js/dashboard/dashboard-page.js'],
- clients: data.clients || []
+ clients: data.clients || [],
+ pagination: data.pagination || null
});
};
\ No newline at end of file
diff --git a/src/web/routes/signage/clients/routes.js b/src/web/routes/signage/clients/routes.js
index e3745f9..fb91739 100644
--- a/src/web/routes/signage/clients/routes.js
+++ b/src/web/routes/signage/clients/routes.js
@@ -2,12 +2,22 @@ module.exports = function registerClientsRoutes(app, deps) {
const pool = deps.pool;
const pages = deps.pages;
const buildDashboardState = deps.buildDashboardState;
+ const { buildPagination } = require('../../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
app.get('/clients', requirePermission('clients.read'), async function (req, res, next) {
try {
const data = await buildDashboardState(pool);
- res.send(pages.renderConnectedClientsPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const totalItems = Array.isArray(data.clients) ? data.clients.length : 0;
+ const startIndex = (page - 1) * LIST_PAGE_SIZE;
+ const clients = (data.clients || []).slice(startIndex, startIndex + LIST_PAGE_SIZE);
+ res.send(pages.renderConnectedClientsPage({
+ clients: clients,
+ pagination: buildPagination(totalItems, page, 'page', {}, LIST_PAGE_SIZE, 'clients', 'Client pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/signage/playlists/add.js b/src/web/routes/signage/playlists/add.js
index aa08540..06ad89a 100644
--- a/src/web/routes/signage/playlists/add.js
+++ b/src/web/routes/signage/playlists/add.js
@@ -5,7 +5,8 @@ module.exports = function renderPlaylistFormPage(message, currentUser) {
title: 'Create playlist',
active: 'playlists',
playlist: {
- fade_between_slides: false
+ fade_between_slides: false,
+ skip_unavailable_rtmp: false
},
message: message,
currentUser: currentUser || null
diff --git a/src/web/routes/signage/playlists/edit.js b/src/web/routes/signage/playlists/edit.js
index 07ebd8d..224ce57 100644
--- a/src/web/routes/signage/playlists/edit.js
+++ b/src/web/routes/signage/playlists/edit.js
@@ -102,6 +102,7 @@ module.exports = function renderPlaylistEditPage(playlist, data, message, curren
currentUser: currentUser || null,
playlist: playlist,
playlistFadeBetweenSlides: Boolean(playlist.fade_between_slides),
+ playlistSkipUnavailableRtmp: Boolean(playlist.skip_unavailable_rtmp),
playlistSlides: playlistSlides,
slides: data.slides || [],
hasSlides: (data.slides || []).length > 0,
@@ -110,6 +111,6 @@ module.exports = function renderPlaylistEditPage(playlist, data, message, curren
selectableSlides: selectableSlides,
playlistCanvasSignature: playlistCanvasSignature,
playlistCanvasMismatch: playlistCanvasMismatch,
- scripts: ['js/vendor/sortable.min.js', 'js/playlists/playlist-schedule.js']
+ scripts: ['js/lib/modal.js', 'js/vendor/sortable.min.js', 'js/playlists/playlist-schedule.js']
});
};
diff --git a/src/web/routes/signage/playlists/list.js b/src/web/routes/signage/playlists/list.js
index 24082ea..2c2eacd 100644
--- a/src/web/routes/signage/playlists/list.js
+++ b/src/web/routes/signage/playlists/list.js
@@ -1,9 +1,10 @@
const { renderView } = require('../../../view');
module.exports = function renderPlaylistsPage(data, message, currentUser) {
- const playlistSlides = data.playlistSlides || [];
const playlists = (data.playlists || []).map((playlist) => {
- const slideCount = playlistSlides.filter((item) => item.playlist_id === playlist.id).length;
+ const slideCount = playlist.slide_count !== undefined
+ ? Number(playlist.slide_count) || 0
+ : (data.playlistSlides || []).filter((item) => item.playlist_id === playlist.id).length;
return Object.assign({}, playlist, {
slideCount: slideCount,
slideCountIsOne: slideCount === 1
@@ -15,7 +16,8 @@ module.exports = function renderPlaylistsPage(data, message, currentUser) {
active: 'playlists',
message: message,
currentUser: currentUser || null,
- playlists: playlists
+ playlists: playlists,
+ pagination: data.pagination || null
});
};
diff --git a/src/web/routes/signage/playlists/routes.js b/src/web/routes/signage/playlists/routes.js
index 5c9705b..c69a140 100644
--- a/src/web/routes/signage/playlists/routes.js
+++ b/src/web/routes/signage/playlists/routes.js
@@ -2,8 +2,11 @@ module.exports = function registerPlaylistsRoutes(app, deps) {
const pool = deps.pool;
const common = deps.common;
const pages = deps.pages;
+ const { buildPagination } = require('../../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
function requireQueryPermission(readPermissionKey, editPermissionKey) {
return function (req, res, next) {
const permissionKey = req.query && req.query.edit ? editPermissionKey : readPermissionKey;
@@ -13,15 +16,20 @@ module.exports = function registerPlaylistsRoutes(app, deps) {
app.get('/playlists', requireQueryPermission('playlists.read', 'playlists.update'), async function (req, res, next) {
try {
- const data = await common.fetchAdminData(pool);
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
if (req.query.edit) {
+ const data = await common.fetchAdminData(pool);
const playlist = await common.fetchPlaylistById(pool, Number(req.query.edit));
if (!playlist) {
return res.status(404).send('Playlist not found');
}
return res.send(pages.renderPlaylistEditPage(playlist, data, req.query.message ? String(req.query.message) : '', req.currentUser));
}
- res.send(pages.renderPlaylistsPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const data = await common.fetchPlaylistsPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderPlaylistsPage({
+ playlists: data.playlists || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'playlists', 'Playlist pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/signage/playlists/slide-config.js b/src/web/routes/signage/playlists/slide-config.js
index 06c10f3..bc2b9c8 100644
--- a/src/web/routes/signage/playlists/slide-config.js
+++ b/src/web/routes/signage/playlists/slide-config.js
@@ -74,6 +74,6 @@ module.exports = function renderPlaylistSlideConfigPage(playlist, playlistSlide,
...day,
checked: selectedDays.has(day.value)
})),
- scripts: ['js/playlists/playlist-schedule.js']
+ scripts: ['js/lib/modal.js', 'js/playlists/playlist-schedule.js']
});
};
diff --git a/src/web/routes/signage/screens/list.js b/src/web/routes/signage/screens/list.js
index b90ffab..4a7acae 100644
--- a/src/web/routes/signage/screens/list.js
+++ b/src/web/routes/signage/screens/list.js
@@ -6,7 +6,8 @@ module.exports = function renderScreensPage(data, message, currentUser) {
active: 'screens',
message: message,
currentUser: currentUser || null,
- screens: data.screens || []
+ screens: data.screens || [],
+ pagination: data.pagination || null
});
};
diff --git a/src/web/routes/signage/screens/routes.js b/src/web/routes/signage/screens/routes.js
index abe4545..56f20be 100644
--- a/src/web/routes/signage/screens/routes.js
+++ b/src/web/routes/signage/screens/routes.js
@@ -3,8 +3,11 @@ module.exports = function registerScreensRoutes(app, deps) {
const common = deps.common;
const pages = deps.pages;
const buildDashboardState = deps.buildDashboardState;
+ const { buildPagination } = require('../../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
function requireQueryPermission(readPermissionKey, editPermissionKey) {
return function (req, res, next) {
const permissionKey = req.query && req.query.edit ? editPermissionKey : readPermissionKey;
@@ -14,8 +17,8 @@ module.exports = function registerScreensRoutes(app, deps) {
app.get('/screens', requireQueryPermission('screens.read', 'screens.update'), async function (req, res, next) {
try {
- const data = await buildDashboardState(pool);
if (req.query.edit) {
+ const data = await buildDashboardState(pool);
const screen = await common.fetchScreenById(pool, Number(req.query.edit));
if (!screen) {
return res.status(404).send('Screen not found');
@@ -23,7 +26,12 @@ module.exports = function registerScreensRoutes(app, deps) {
const editData = await common.fetchScreenEditData(pool);
return res.send(pages.renderScreenEditPage(screen, editData, req.query.message ? String(req.query.message) : '', req.currentUser));
}
- res.send(pages.renderScreensPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchScreensPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderScreensPage({
+ screens: data.screens || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'screens', 'Screen pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/signage/slides/list.js b/src/web/routes/signage/slides/list.js
index 4441fc2..302f2a0 100644
--- a/src/web/routes/signage/slides/list.js
+++ b/src/web/routes/signage/slides/list.js
@@ -6,7 +6,8 @@ module.exports = function renderSlidesPage(data, message, currentUser) {
active: 'slides',
message: message,
currentUser: currentUser || null,
- slides: data.slides || []
+ slides: data.slides || [],
+ pagination: data.pagination || null
});
};
diff --git a/src/web/routes/signage/slides/routes.js b/src/web/routes/signage/slides/routes.js
index 65962a9..aa52f43 100644
--- a/src/web/routes/signage/slides/routes.js
+++ b/src/web/routes/signage/slides/routes.js
@@ -2,12 +2,19 @@ module.exports = function registerSlidesRoutes(app, deps) {
const pages = deps.pages;
const common = deps.common;
const pool = deps.pool;
+ const { buildPagination } = require('../../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
app.get('/slides', requirePermission('slides.read'), async function (req, res, next) {
try {
- const data = await common.fetchAdminData(pool);
- res.send(pages.renderSlidesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchSlidesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderSlidesPage({
+ slides: data.slides || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'slides', 'Slide pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/routes/signage/templates/add.js b/src/web/routes/signage/templates/add.js
index 7980c34..69d816e 100644
--- a/src/web/routes/signage/templates/add.js
+++ b/src/web/routes/signage/templates/add.js
@@ -50,6 +50,6 @@ module.exports = function renderTemplateFormPage(template, mode, message, canvas
currentUser: currentUser || null,
template: current,
canvasSizes: canvasSizes || [],
- scripts: ['js/templates/template-designer-utils.js', 'js/templates/template-designer.js']
+ scripts: ['js/lib/modal.js', 'js/templates/template-designer-utils.js', 'js/templates/template-designer.js']
});
};
diff --git a/src/web/routes/signage/templates/list.js b/src/web/routes/signage/templates/list.js
index 48da7c1..e311cd8 100644
--- a/src/web/routes/signage/templates/list.js
+++ b/src/web/routes/signage/templates/list.js
@@ -6,7 +6,9 @@ module.exports = function renderTemplatesPage(data, message, currentUser) {
name: template.name,
canvas_size_width: template.canvas_size_width,
canvas_size_height: template.canvas_size_height,
- regionCount: (data.templateRegions || []).filter((region) => region.template_id === template.id).length
+ regionCount: template.region_count !== undefined
+ ? Number(template.region_count) || 0
+ : (data.templateRegions || []).filter((region) => region.template_id === template.id).length
}));
return renderView('templates/list', {
@@ -14,6 +16,7 @@ module.exports = function renderTemplatesPage(data, message, currentUser) {
active: 'templates',
message: message,
currentUser: currentUser || null,
- templates: templates
+ templates: templates,
+ pagination: data.pagination || null
});
};
diff --git a/src/web/routes/signage/templates/routes.js b/src/web/routes/signage/templates/routes.js
index d604e4c..df74118 100644
--- a/src/web/routes/signage/templates/routes.js
+++ b/src/web/routes/signage/templates/routes.js
@@ -2,12 +2,19 @@ module.exports = function registerTemplatesRoutes(app, deps) {
const pages = deps.pages;
const common = deps.common;
const pool = deps.pool;
+ const { buildPagination } = require('../../../lib/pagination');
const requirePermission = deps.requirePermission;
+ const LIST_PAGE_SIZE = 10;
+
app.get('/templates', requirePermission('templates.read'), async function (req, res, next) {
try {
- const data = await common.fetchTemplatesData(pool);
- res.send(pages.renderTemplatesPage(data, req.query.message ? String(req.query.message) : '', req.currentUser));
+ const page = Math.max(1, Math.floor(Number(req.query.page) || 1));
+ const data = await common.fetchTemplatesPage(pool, page, LIST_PAGE_SIZE);
+ res.send(pages.renderTemplatesPage({
+ templates: data.templates || [],
+ pagination: buildPagination(data.totalItems, data.currentPage, 'page', {}, LIST_PAGE_SIZE, 'templates', 'Template pages')
+ }, req.query.message ? String(req.query.message) : '', req.currentUser));
} catch (error) {
next(error);
}
diff --git a/src/web/view.js b/src/web/view.js
index 619c744..991d292 100644
--- a/src/web/view.js
+++ b/src/web/view.js
@@ -109,6 +109,9 @@ Handlebars.registerHelper('saveActionButtons', function (options) {
].join(''));
});
+Handlebars.registerPartial('modal-shell', fs.readFileSync(path.join(VIEWS_ROOT, 'shared', 'modal-shell.hbs'), 'utf8'));
+Handlebars.registerPartial('table-pagination', fs.readFileSync(path.join(VIEWS_ROOT, 'shared', 'table-pagination.hbs'), 'utf8'));
+
function resolveTemplatePath(relativePath) {
const firstSegment = String(relativePath || '').split(/[\\/]/)[0];
if (SIGNAGE_VIEW_PREFIXES.has(firstSegment)) {
diff --git a/src/web/views/data-sources/api-sources/list.hbs b/src/web/views/data-sources/api-sources/list.hbs
index 06a77f0..c0f3870 100644
--- a/src/web/views/data-sources/api-sources/list.hbs
+++ b/src/web/views/data-sources/api-sources/list.hbs
@@ -5,17 +5,21 @@
 + ')
' : '',
+ regionsHtml,
+ '