diff --git a/.gitignore b/.gitignore
index 6b09581..fb61e35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ npm-debug.log*
yarn-debug.log*
yarn-error.log*
.DS_Store
+TODO.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 637454b..65ed658 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,66 @@
All notable changes to this project will be documented in this file.
+## 2.5.6 - 2026-08-05
+
+### Added
+
+- Onboarding QR rendering now uses the vendored `qr-code-styling` library directly, with a wider quiet zone and extra frame padding so the code does not clip at the corners.
+
+### Changed
+
+- The shared QR helper now renders `qr-code-styling` in Node without the old `qrcode` or `qrcode-generator` packages.
+- The onboarding QR endpoint now generates the styled QR at request time, and the player onboarding page requests it only after confirming the player is not already onboarded.
+- Playlist QR preview backfill now uses the same styled QR helper as onboarding, so playlist snapshots and generated previews stay consistent.
+- The onboarding QR layout now keeps the code inset within its frame so the corners have more breathing room.
+
+## 2.5.5 - 2026-08-04
+
+### Added
+
+- A shared Dupe flow was added to most admin create pages and list views, including roles, users, playlists, slides, templates, canvas sizes, announcements, and supported data sources.
+
+### Changed
+
+- RBAC roles now include a Dupe action that opens a copy-on-create flow with the selected permissions already populated.
+- Users now include a Dupe action that opens the add-user form with the copied name and roles, while leaving the username blank for a new login.
+- User usernames are now editable from the admin users section, while the personal account password page remains unchanged.
+- The users form now allows creating an account without assigning any roles.
+- Save and New on the users form now returns to the blank create page instead of falling back to the list.
+- Password updates now accept a slightly lighter policy of 10 characters with 3 of 4 character classes, and the account and user password forms now describe the updated requirement.
+- The slide rich-text editor now groups underline, strikethrough, subscript, and superscript into a single split-button control, with the main button using the underline icon and the dropdown exposing the other text-format actions.
+- Chip formatting in the slide rich-text editor now uses a reusable inline-format helper so the chip action continues to sync and mark the editor as edited when applied.
+- RSS, API, and timetable placeholder help text now uses the same transform examples, spacing, and typography as the timetable version, with the hint shown after the visible placeholders and before any overflow disclosure.
+
+### Fixed
+
+- Cells and inputs now enforce route-specific character limits on the form itself and on the matching save paths, so overlong values no longer fail at submit time.
+- Playlist rows now use a grip drag handle with separate up/down move controls, and the drag grip cursor now changes to grab and grabbing on hover and drag.
+- Playlist duration inputs now respect a min-only limit correctly, so the shared limiter no longer coerces values down to 0 when no max attribute is present.
+- Playlist row video and mute toggles now use the correct filled/outline Bootstrap button styles for their current state without relying on the `active` class.
+- Slides table search now only matches slide titles and template names, and no longer searches within slide content.
+- Banner marquee text now measures its real cycle width so top-banner and lower-third announcements loop continuously instead of resetting from a fixed start position.
+- Slide editor template selection now stays editable on blank slides until the user makes a real content edit, so TinyMCE hydration no longer locks the canvas immediately.
+- Slide editor region cards now share a common header shell, so the image and video chips stay aligned with the other region types on the Video Webpage and HTML RTMP pages.
+- Firefox preview popup now centers the preview canvas in normal layout flow and scales from the center, so the popup preview lines up correctly in Chrome and Firefox.
+- Canvas size edits now keep the width and height fields locked while the size is in use, and oversized canvas dimensions are rejected at 16384 instead of reaching the save path.
+- Schedule rules now start collapsed by default, use the built-in card collapse behavior, and keep validation messages visible without re-highlighting empty paired inputs.
+- Timetable group deletes now scan slide content for the actual `timetable_group_id` field, so groups that are still referenced by slides stay protected from deletion.
+- Timetable add and edit pages now keep cancel confirmation tied to timetable entry edits, so changes inside the entries table are treated as unsaved form changes.
+- Screen add and edit pages now keep the Player URL box in a stable two-column layout, so switching between the forms no longer causes the page to jump or shift.
+- Screen add pages now show the secondary Save and Close / Save and New actions, and screen edit delete actions now prompt for confirmation before removing the screen.
+- Admin user password resets now keep the selected user in view by returning to that user's edit page after saving.
+- Account password saves now refresh the page after the success toast is queued so the confirmation message stays visible.
+- Shared toast handling now preserves a pending success message across the redirect so refreshes do not drop the confirmation banner.
+- Announcement create and edit pages now keep the save action buttons visible, and the edit-page delete action now prompts for confirmation before deleting.
+- Active announcements are now blocked from deletion with a clearer edit-page message that explains why.
+- Slide template create now shows the background image remove button and clear flag, matching the edit page behavior.
+- Template create now exposes Save & Close and Save & New actions, and template edit delete actions now use the shared action-button helper with a confirmation prompt instead of a separate hidden form.
+- The advanced animation modal now shows intro, outro, and loop durations as 1-200% fields, with 100% saving back as 1000ms.
+- The advanced animation modal now hard-limits repeat counts to 999 so attention-seeker animations cannot be configured with unbounded loops.
+- Template editor region boxes now rerender when the canvas or stage resizes, and region width/height changes now keep the lock ratio, stay within the canvas, and shift back on-canvas instead of spilling over.
+- Background tasks and scheduled tasks now render timestamps in 24-hour format, and the background task queue keeps a confirmation prompt before clearing finished items.
+
## 2.5.4 - 2026-08-03
### Changed
diff --git a/package-lock.json b/package-lock.json
index 0307413..6772fc8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "pulse-signage",
- "version": "2.5.4",
+ "version": "2.5.6",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "pulse-signage",
- "version": "2.5.4",
+ "version": "2.5.6",
"dependencies": {
"@sparticuz/chromium": "^137.0.0",
"animate.css": "^4.1.1",
@@ -19,8 +19,6 @@
"multer": "^2.2.0",
"mysql2": "^3.14.3",
"puppeteer-core": "^24.16.0",
- "qrcode": "^1.5.4",
- "qrcode-generator": "^2.0.4",
"sharp": "^0.35.3",
"ws": "^8.21.0"
},
@@ -1090,15 +1088,6 @@
"url": "https://github.com/sponsors/ljharb"
}
},
- "node_modules/camelcase": {
- "version": "5.3.1",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
- "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/chokidar": {
"version": "3.6.0",
"resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
@@ -1137,17 +1126,6 @@
"devtools-protocol": "*"
}
},
- "node_modules/cliui": {
- "version": "6.0.0",
- "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
- "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
- "license": "ISC",
- "dependencies": {
- "string-width": "^4.2.0",
- "strip-ansi": "^6.0.0",
- "wrap-ansi": "^6.2.0"
- }
- },
"node_modules/color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
@@ -1241,15 +1219,6 @@
"ms": "2.0.0"
}
},
- "node_modules/decamelize": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
- "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
- "license": "MIT",
- "engines": {
- "node": ">=0.10.0"
- }
- },
"node_modules/degenerator": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
@@ -1307,12 +1276,6 @@
"integrity": "sha512-Tpm17fxYzt+J7VrGdc1k8YdRqS3YV7se/M6KeemEqvUbq/n7At1rWVuXMxQgpWkdwSdIEKYbU//Bve+Shm4YNQ==",
"license": "BSD-3-Clause"
},
- "node_modules/dijkstrajs": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz",
- "integrity": "sha512-qiSlmBq9+BCdCA/L46dw8Uy93mloxsPSbwnm5yrKn2vMPiy8KyAskTF6zuV/j5BMsmOGZDPs7KjU+mjb670kfA==",
- "license": "MIT"
- },
"node_modules/dotenv": {
"version": "17.4.2",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz",
@@ -1619,19 +1582,6 @@
"node": ">= 0.8"
}
},
- "node_modules/find-up": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
- "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
- "license": "MIT",
- "dependencies": {
- "locate-path": "^5.0.0",
- "path-exists": "^4.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/follow-redirects": {
"version": "1.16.0",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz",
@@ -2083,18 +2033,6 @@
"integrity": "sha512-Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==",
"license": "MIT"
},
- "node_modules/locate-path": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
- "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
- "license": "MIT",
- "dependencies": {
- "p-locate": "^4.1.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/long": {
"version": "5.3.2",
"resolved": "https://registry.npmjs.org/long/-/long-5.3.2.tgz",
@@ -2412,42 +2350,6 @@
"wrappy": "1"
}
},
- "node_modules/p-limit": {
- "version": "2.3.0",
- "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
- "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
- "license": "MIT",
- "dependencies": {
- "p-try": "^2.0.0"
- },
- "engines": {
- "node": ">=6"
- },
- "funding": {
- "url": "https://github.com/sponsors/sindresorhus"
- }
- },
- "node_modules/p-locate": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
- "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
- "license": "MIT",
- "dependencies": {
- "p-limit": "^2.2.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/p-try": {
- "version": "2.2.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
- "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
- "license": "MIT",
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/pac-proxy-agent": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
@@ -2512,15 +2414,6 @@
"node": ">= 0.8"
}
},
- "node_modules/path-exists": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
- "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
- "license": "MIT",
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/path-to-regexp": {
"version": "0.1.13",
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.13.tgz",
@@ -2546,15 +2439,6 @@
"url": "https://github.com/sponsors/jonschlinkert"
}
},
- "node_modules/pngjs": {
- "version": "5.0.0",
- "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-5.0.0.tgz",
- "integrity": "sha512-40QW5YalBNfQo5yRYmiw7Yz6TKKVr3h6970B2YE+3fQpsWcrbj1PzJgxeJ19DRQjhMbKPIuMY8rFaXc8moolVw==",
- "license": "MIT",
- "engines": {
- "node": ">=10.13.0"
- }
- },
"node_modules/progress": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -2692,29 +2576,6 @@
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
- "node_modules/qrcode": {
- "version": "1.5.4",
- "resolved": "https://registry.npmjs.org/qrcode/-/qrcode-1.5.4.tgz",
- "integrity": "sha512-1ca71Zgiu6ORjHqFBDpnSMTR2ReToX4l1Au1VFLyVeBTFavzQnv5JxMFr3ukHVKpSrSA2MCk0lNJSykjUfz7Zg==",
- "license": "MIT",
- "dependencies": {
- "dijkstrajs": "^1.0.1",
- "pngjs": "^5.0.0",
- "yargs": "^15.3.1"
- },
- "bin": {
- "qrcode": "bin/qrcode"
- },
- "engines": {
- "node": ">=10.13.0"
- }
- },
- "node_modules/qrcode-generator": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/qrcode-generator/-/qrcode-generator-2.0.4.tgz",
- "integrity": "sha512-mZSiP6RnbHl4xL2Ap5HfkjLnmxfKcPWpWe/c+5XxCuetEenqmNFf1FH/ftXPCtFG5/TDobjsjz6sSNL0Sr8Z9g==",
- "license": "MIT"
- },
"node_modules/qs": {
"version": "6.15.3",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.15.3.tgz",
@@ -2791,12 +2652,6 @@
"node": ">=0.10.0"
}
},
- "node_modules/require-main-filename": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
- "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
- "license": "ISC"
- },
"node_modules/safe-buffer": {
"version": "5.2.1",
"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -2880,12 +2735,6 @@
"node": ">= 0.8.0"
}
},
- "node_modules/set-blocking": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
- "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
- "license": "ISC"
- },
"node_modules/setprototypeof": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -3359,32 +3208,12 @@
"integrity": "sha512-ARrjNjtWRRs2w4Tk7nqrf2gBI0QXWuOmMCx2hU+1jUt6d00MjMxURrhxhGbrsoiZKJrhTSTzbIrc554iKI10qw==",
"license": "Apache-2.0"
},
- "node_modules/which-module": {
- "version": "2.0.1",
- "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
- "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
- "license": "ISC"
- },
"node_modules/wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
"integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==",
"license": "MIT"
},
- "node_modules/wrap-ansi": {
- "version": "6.2.0",
- "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
- "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
- "license": "MIT",
- "dependencies": {
- "ansi-styles": "^4.0.0",
- "string-width": "^4.1.0",
- "strip-ansi": "^6.0.0"
- },
- "engines": {
- "node": ">=8"
- }
- },
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
@@ -3412,47 +3241,6 @@
}
}
},
- "node_modules/y18n": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
- "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
- "license": "ISC"
- },
- "node_modules/yargs": {
- "version": "15.4.1",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
- "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
- "license": "MIT",
- "dependencies": {
- "cliui": "^6.0.0",
- "decamelize": "^1.2.0",
- "find-up": "^4.1.0",
- "get-caller-file": "^2.0.1",
- "require-directory": "^2.1.1",
- "require-main-filename": "^2.0.0",
- "set-blocking": "^2.0.0",
- "string-width": "^4.2.0",
- "which-module": "^2.0.0",
- "y18n": "^4.0.0",
- "yargs-parser": "^18.1.2"
- },
- "engines": {
- "node": ">=8"
- }
- },
- "node_modules/yargs-parser": {
- "version": "18.1.3",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
- "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
- "license": "ISC",
- "dependencies": {
- "camelcase": "^5.0.0",
- "decamelize": "^1.2.0"
- },
- "engines": {
- "node": ">=6"
- }
- },
"node_modules/yauzl": {
"version": "2.10.0",
"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
diff --git a/package.json b/package.json
index 53e25a4..2c5db7f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "pulse-signage",
- "version": "2.5.4",
+ "version": "2.5.6",
"private": false,
"description": "Pulse Signage application with MySQL and media storage",
"repository": {
@@ -28,8 +28,6 @@
"multer": "^2.2.0",
"mysql2": "^3.14.3",
"puppeteer-core": "^24.16.0",
- "qrcode": "^1.5.4",
- "qrcode-generator": "^2.0.4",
"sharp": "^0.35.3",
"ws": "^8.21.0"
},
diff --git a/src/auth.js b/src/auth.js
index 882689a..d93acb3 100644
--- a/src/auth.js
+++ b/src/auth.js
@@ -7,6 +7,21 @@ const PASSWORD_KEY_LENGTH = 32;
const PASSWORD_DIGEST = 'sha256';
const SESSION_BYTES = 32;
+function validatePasswordStrength(password) {
+ const value = String(password || '');
+ const hasLowercase = /[a-z]/.test(value);
+ const hasUppercase = /[A-Z]/.test(value);
+ const hasNumber = /[0-9]/.test(value);
+ const hasSymbol = /[^A-Za-z0-9]/.test(value);
+ const categoryCount = [hasLowercase, hasUppercase, hasNumber, hasSymbol].filter(Boolean).length;
+
+ if (value.length < 10 || categoryCount < 3) {
+ return 'Password must be at least 10 characters and include 3 of: uppercase, lowercase, number, and symbol.';
+ }
+
+ return '';
+}
+
function hashPassword(password, salt) {
const safePassword = String(password || '');
const safeSalt = salt || crypto.randomBytes(16).toString('hex');
@@ -40,6 +55,7 @@ function hashSessionToken(token) {
module.exports = {
hashPassword,
verifyPassword,
+ validatePasswordStrength,
createSessionToken,
hashSessionToken
};
\ No newline at end of file
diff --git a/src/common.js b/src/common.js
index f5a7efb..a90d613 100644
--- a/src/common.js
+++ b/src/common.js
@@ -37,6 +37,8 @@ module.exports = {
slugify: data.slugify,
uniqueScreenSlug: data.uniqueScreenSlug,
parseJsonSafe: data.parseJsonSafe,
+ validateMaxLength: data.validateMaxLength,
+ truncateToMaxLength: data.truncateToMaxLength,
fetchAdminData: data.fetchAdminData,
fetchPlaylistsPage: data.fetchPlaylistsPage,
fetchSlidesPage: data.fetchSlidesPage,
@@ -91,6 +93,7 @@ module.exports = {
fetchCanvasSizesData: data.fetchCanvasSizesData,
fetchCanvasSizeById: data.fetchCanvasSizeById,
buildCanvasSizePayload: data.buildCanvasSizePayload,
+ MAX_CANVAS_SIZE_DIMENSION: data.MAX_CANVAS_SIZE_DIMENSION,
buildSlidePayload: data.buildSlidePayload,
extractTemplateRegions: data.extractTemplateRegions,
buildTemplatePayload: data.buildTemplatePayload,
diff --git a/src/data/admin.js b/src/data/admin.js
index 5282d00..61bb47e 100644
--- a/src/data/admin.js
+++ b/src/data/admin.js
@@ -94,7 +94,7 @@ async function fetchSlidesPage(pool, page, pageSize, searchTerm, sortKey, sortDi
LEFT JOIN c_canvas_sizes cs ON cs.id = st.canvas_size_id
ORDER BY s.id DESC`,
countSql: 'SELECT COUNT(*) AS count FROM c_slides',
- searchColumns: ['s.title', 'st.name', 's.content_json'],
+ searchColumns: ['s.title', 'st.name'],
searchTerm: searchTerm,
sortColumns: {
title: 's.title',
diff --git a/src/data/announcements.js b/src/data/announcements.js
index 786b362..2b62078 100644
--- a/src/data/announcements.js
+++ b/src/data/announcements.js
@@ -6,6 +6,9 @@ const {
DEFAULT_ANNOUNCEMENT_ICON,
normalizeAnnouncementIcon: normalizeAnnouncementIconFromConfig
} = require('./announcement-icons');
+const { validateMaxLength } = require('./utils');
+
+const SHORT_LABEL_MAX_LENGTH = 255;
const ANNOUNCEMENT_TYPES = ['lower-third', 'fullscreen', 'top-banner'];
const ANNOUNCEMENT_COLORS = ['primary', 'secondary', 'success', 'info', 'warning', 'danger', 'dark', 'light'];
@@ -57,7 +60,7 @@ function normalizeAnnouncementScreenIds(value) {
function buildAnnouncementPayload(input) {
const message = normalizeAnnouncementMessage(input && input.message);
- const shortLabel = normalizeAnnouncementShortLabel(input && input.short_label);
+ const shortLabel = validateMaxLength(normalizeAnnouncementShortLabel(input && input.short_label), SHORT_LABEL_MAX_LENGTH, 'Announcement short description');
const announcementType = normalizeAnnouncementType(input && input.announcement_type);
const colorKey = normalizeAnnouncementColor(input && input.color_key);
const iconKey = normalizeAnnouncementIconFromConfig(input && input.icon_key);
diff --git a/src/data/api-sources.js b/src/data/api-sources.js
index 1c05237..c3ac3ef 100644
--- a/src/data/api-sources.js
+++ b/src/data/api-sources.js
@@ -2,7 +2,12 @@
const http = require('http');
const https = require('https');
-const { fetchPagedRows } = require('./utils');
+const { fetchPagedRows, validateMaxLength } = require('./utils');
+
+const NAME_MAX_LENGTH = 255;
+const URL_MAX_LENGTH = 1024;
+const AUTH_MAX_LENGTH = 255;
+const ITEMS_PATH_MAX_LENGTH = 255;
function normalizeUpdateIntervalUnit(value) {
const unit = String(value || '').trim().toLowerCase();
@@ -171,15 +176,15 @@ function buildApiSourcePayload(req, existingApiSource) {
return fallbackValue;
}
- const name = String(req.body.name || fallback.name || '').trim();
- const apiUrl = String(req.body.api_url || req.body.apiUrl || fallback.api_url || '').trim();
+ const name = validateMaxLength(req.body.name || fallback.name || '', NAME_MAX_LENGTH, 'API source name');
+ const apiUrl = validateMaxLength(req.body.api_url || req.body.apiUrl || fallback.api_url || '', URL_MAX_LENGTH, 'API source URL');
const authMethod = normalizeAuthMethod(readBodyValue('auth_method', readBodyValue('authMethod', fallback.auth_method || 'none')));
- const authUsername = String(readBodyValue('auth_username', readBodyValue('authUsername', fallback.auth_username || '')) || '').trim();
- const authPassword = String(readBodyValue('auth_password', readBodyValue('authPassword', fallback.auth_password || '')) || '');
- const authBearerToken = String(readBodyValue('auth_bearer_token', readBodyValue('authBearerToken', fallback.auth_bearer_token || '')) || '').trim();
- const authHeaderName = String(readBodyValue('auth_header_name', readBodyValue('authHeaderName', fallback.auth_header_name || 'X-API-Key')) || 'X-API-Key').trim() || 'X-API-Key';
- const authHeaderValue = String(readBodyValue('auth_header_value', readBodyValue('authHeaderValue', fallback.auth_header_value || '')) || '').trim();
- const itemsPath = String(readBodyValue('items_path', readBodyValue('itemsPath', fallback.items_path || '')) || '').trim();
+ const authUsername = validateMaxLength(readBodyValue('auth_username', readBodyValue('authUsername', fallback.auth_username || '')) || '', AUTH_MAX_LENGTH, 'API source username');
+ const authPassword = validateMaxLength(readBodyValue('auth_password', readBodyValue('authPassword', fallback.auth_password || '')) || '', AUTH_MAX_LENGTH, 'API source password');
+ const authBearerToken = validateMaxLength(readBodyValue('auth_bearer_token', readBodyValue('authBearerToken', fallback.auth_bearer_token || '')) || '', AUTH_MAX_LENGTH, 'API source bearer token');
+ const authHeaderName = validateMaxLength(readBodyValue('auth_header_name', readBodyValue('authHeaderName', fallback.auth_header_name || 'X-API-Key')) || 'X-API-Key', AUTH_MAX_LENGTH, 'API source header name') || 'X-API-Key';
+ const authHeaderValue = validateMaxLength(readBodyValue('auth_header_value', readBodyValue('authHeaderValue', fallback.auth_header_value || '')) || '', AUTH_MAX_LENGTH, 'API source header value');
+ const itemsPath = validateMaxLength(readBodyValue('items_path', readBodyValue('itemsPath', fallback.items_path || '')) || '', ITEMS_PATH_MAX_LENGTH, 'API source items path');
const updateIntervalValue = Math.max(1, Number(req.body.update_interval_value || req.body.updateIntervalValue || fallback.update_interval_value || 60));
const updateIntervalUnit = normalizeUpdateIntervalUnit(req.body.update_interval_unit || req.body.updateIntervalUnit || fallback.update_interval_unit || 'minutes');
diff --git a/src/data/canvas-sizes.js b/src/data/canvas-sizes.js
index 47d5584..2e9ae01 100644
--- a/src/data/canvas-sizes.js
+++ b/src/data/canvas-sizes.js
@@ -1,6 +1,7 @@
// Canvas size data access and pagination helpers.
const { fetchPagedRows } = require('./utils');
+const MAX_CANVAS_SIZE_DIMENSION = 16384;
async function fetchCanvasSizesData(pool) {
const [canvasSizes] = await pool.query('SELECT id, name, width, height, created_at, modified_at, created_by, modified_by FROM c_canvas_sizes ORDER BY width ASC, height ASC, name ASC');
@@ -33,10 +34,31 @@ async function fetchCanvasSizeById(pool, id) {
return rows[0] || null;
}
+function readCanvasDimension(rawValue, fallbackValue, fieldName) {
+ const sourceValue = rawValue !== undefined && rawValue !== null && String(rawValue).trim() !== ''
+ ? rawValue
+ : fallbackValue;
+ const numericValue = Number(sourceValue);
+
+ if (!Number.isFinite(numericValue)) {
+ const error = new Error('Canvas size ' + fieldName + ' must be a number.');
+ error.statusCode = 400;
+ throw error;
+ }
+
+ if (numericValue > MAX_CANVAS_SIZE_DIMENSION) {
+ const error = new Error('Canvas size dimensions must be 16384 or less.');
+ error.statusCode = 400;
+ throw error;
+ }
+
+ return Math.max(1, numericValue);
+}
+
function buildCanvasSizePayload(req, existingCanvasSize) {
const name = String(req.body.name || '').trim();
- const width = Math.max(1, Number(req.body.width || (existingCanvasSize && existingCanvasSize.width) || 0));
- const height = Math.max(1, Number(req.body.height || (existingCanvasSize && existingCanvasSize.height) || 0));
+ const width = readCanvasDimension(req.body.width, existingCanvasSize && existingCanvasSize.width, 'width');
+ const height = readCanvasDimension(req.body.height, existingCanvasSize && existingCanvasSize.height, 'height');
if (!name) {
const error = new Error('Canvas size name is required.');
@@ -55,5 +77,6 @@ module.exports = {
fetchCanvasSizesData,
fetchCanvasSizesPage,
fetchCanvasSizeById,
- buildCanvasSizePayload
+ buildCanvasSizePayload,
+ MAX_CANVAS_SIZE_DIMENSION
};
diff --git a/src/data/index.js b/src/data/index.js
index a0dc5b2..463d043 100644
--- a/src/data/index.js
+++ b/src/data/index.js
@@ -9,14 +9,16 @@ const { fetchApiSourcesData, fetchApiSourcesPage, fetchApiSourceById, fetchApiSo
const { fetchRssFeedsData, fetchRssFeedsPage, fetchRssFeedById, fetchRssFeedItemsByFeedId, normalizeRssFeedItem, buildRssFeedPayload, fetchRssFeedItems, replaceRssFeedItems } = require('./rss-feeds');
const { slugify, uniqueScreenSlug, fetchScreenById, fetchScreenEditData, fetchScreenPlayerUrls, fetchScreenPlayerRecord } = require('./screens');
const { fetchTemplateById, fetchTemplatesData, extractTemplateRegions, buildTemplatePayload } = require('./templates');
-const { fetchCanvasSizesData, fetchCanvasSizeById, buildCanvasSizePayload } = require('./canvas-sizes');
+const { fetchCanvasSizesData, fetchCanvasSizeById, buildCanvasSizePayload, MAX_CANVAS_SIZE_DIMENSION } = require('./canvas-sizes');
const { fetchSlideById, buildSlidePayload } = require('./slides');
-const { parseJsonSafe, fetchDuplicateName } = require('./utils');
+const { parseJsonSafe, fetchDuplicateName, validateMaxLength, truncateToMaxLength } = require('./utils');
module.exports = {
slugify,
uniqueScreenSlug,
parseJsonSafe,
+ validateMaxLength,
+ truncateToMaxLength,
fetchAdminData,
fetchPlaylistsPage,
fetchSlidesPage,
@@ -66,6 +68,7 @@ module.exports = {
fetchCanvasSizesData,
fetchCanvasSizeById,
buildCanvasSizePayload,
+ MAX_CANVAS_SIZE_DIMENSION,
buildSlidePayload,
extractTemplateRegions,
buildTemplatePayload,
diff --git a/src/data/qr-code.js b/src/data/qr-code.js
index 5fefedb..ebe7520 100644
--- a/src/data/qr-code.js
+++ b/src/data/qr-code.js
@@ -1,29 +1,561 @@
-const QRCode = require('qrcode');
+const fs = require('fs');
+const path = require('path');
+const QRCodeStyling = require(path.join(__dirname, '..', 'web', 'public', 'vendor', 'qr-code-styling', 'qr-code-styling.js'));
+const puppeteer = require('puppeteer-core');
+const chromiumModule = require('@sparticuz/chromium');
+const QR_PNG_WIDTH = 2048;
+const QR_STYLING_SCRIPT_PATH = path.join(__dirname, '..', 'web', 'public', 'vendor', 'qr-code-styling', 'qr-code-styling.js');
+const SYSTEM_CHROMIUM_PATHS = [
+ process.env.PUPPETEER_EXECUTABLE_PATH,
+ process.env.CHROMIUM_PATH,
+ '/usr/bin/chromium',
+ '/usr/bin/chromium-browser',
+ '/usr/local/bin/chromium',
+ '/snap/bin/chromium'
+].filter(Boolean);
+const chromium = chromiumModule && typeof chromiumModule.executablePath === 'function'
+ ? chromiumModule
+ : chromiumModule && chromiumModule.default && typeof chromiumModule.default.executablePath === 'function'
+ ? chromiumModule.default
+ : chromiumModule;
+let qrBrowserPromise = null;
-async function createQrCodeSvg(value) {
- const text = String(value === undefined || value === null ? '' : value).trim();
- if (!text) {
- return '';
- }
-
- return QRCode.toString(text, {
- type: 'svg',
- margin: 1,
- errorCorrectionLevel: 'M'
+function escapeXml(value) {
+ return String(value === undefined || value === null ? '' : value).replace(/[&<>"']/g, function (character) {
+ return {
+ '&': '&',
+ '<': '<',
+ '>': '>',
+ '"': '"',
+ "'": '''
+ }[character];
});
}
-async function buildQrCodeContent(value) {
- const text = String(value === undefined || value === null ? '' : value).trim();
+function serializeNode(node) {
+ if (!node) {
+ return '';
+ }
+ if (node.nodeType === 3) {
+ return escapeXml(node.textContent || '');
+ }
+
+ const attributeEntries = Object.keys(node.attributes || {}).map(function (name) {
+ return name + '="' + escapeXml(node.attributes[name]) + '"';
+ });
+ if (node.tagName === 'svg' && node.namespaceURI === 'http://www.w3.org/2000/svg' && !Object.prototype.hasOwnProperty.call(node.attributes || {}, 'xmlns')) {
+ attributeEntries.unshift('xmlns="http://www.w3.org/2000/svg"');
+ }
+ const attributes = attributeEntries.join(' ');
+ const children = (node.childNodes || []).map(serializeNode).join('') + escapeXml(node.textContent || '');
+ return '<' + node.tagName + (attributes ? ' ' + attributes : '') + '>' + children + '' + node.tagName + '>';
+}
+
+function createDomNode(tagName, namespaceUri) {
+ return {
+ tagName: tagName,
+ namespaceURI: namespaceUri || null,
+ attributes: {},
+ childNodes: [],
+ parentNode: null,
+ nodeType: 1,
+ textContent: '',
+ style: {},
+ setAttribute: function (name, value) {
+ this.attributes[name] = String(value);
+ },
+ appendChild: function (child) {
+ if (child) {
+ this.childNodes.push(child);
+ child.parentNode = this;
+ }
+ return child;
+ },
+ removeChild: function (child) {
+ this.childNodes = this.childNodes.filter(function (node) { return node !== child; });
+ return child;
+ },
+ get firstChild() {
+ return this.childNodes[0] || null;
+ },
+ get outerHTML() {
+ return serializeNode(this);
+ }
+ };
+}
+
+function createCanvasContext() {
+ return {
+ fillStyle: '#000000',
+ strokeStyle: '#000000',
+ lineWidth: 1,
+ beginPath: function () {},
+ closePath: function () {},
+ clearRect: function () {},
+ fillRect: function () {},
+ strokeRect: function () {},
+ moveTo: function () {},
+ lineTo: function () {},
+ arc: function () {},
+ rect: function () {},
+ fill: function () {},
+ stroke: function () {},
+ save: function () {},
+ restore: function () {},
+ translate: function () {},
+ rotate: function () {},
+ scale: function () {},
+ setTransform: function () {},
+ transform: function () {},
+ drawImage: function () {},
+ measureText: function (text) {
+ return { width: String(text === undefined || text === null ? '' : text).length * 8 };
+ },
+ createLinearGradient: function () {
+ return { addColorStop: function () {} };
+ },
+ createRadialGradient: function () {
+ return { addColorStop: function () {} };
+ },
+ createPattern: function () {
+ return null;
+ },
+ getImageData: function () {
+ return { data: [] };
+ },
+ putImageData: function () {},
+ clip: function () {}
+ };
+}
+
+function createCanvasNode() {
+ const node = createDomNode('canvas', 'http://www.w3.org/1999/xhtml');
+ node.width = 0;
+ node.height = 0;
+ node.getContext = function () {
+ return createCanvasContext();
+ };
+ node.toDataURL = function () {
+ return '';
+ };
+ node.toBlob = function (callback) {
+ if (typeof callback === 'function') {
+ callback(null);
+ }
+ };
+ return node;
+}
+
+function createQrStylingWindow() {
+ const document = {
+ createElement: function (tagName) {
+ if (String(tagName || '').toLowerCase() === 'canvas') {
+ return createCanvasNode();
+ }
+ return createDomNode(tagName, 'http://www.w3.org/1999/xhtml');
+ },
+ createElementNS: function (namespaceUri, tagName) {
+ return createDomNode(tagName, namespaceUri);
+ },
+ createTextNode: function (text) {
+ return {
+ nodeType: 3,
+ textContent: String(text === undefined || text === null ? '' : text),
+ parentNode: null
+ };
+ },
+ body: createDomNode('body', 'http://www.w3.org/1999/xhtml'),
+ head: createDomNode('head', 'http://www.w3.org/1999/xhtml')
+ };
+
+ const window = {
+ document: document,
+ navigator: { userAgent: 'node' },
+ URL: {
+ createObjectURL: function () { return ''; },
+ revokeObjectURL: function () {}
+ }
+ };
+
+ window.window = window;
+ window.self = window;
+ window.Image = class {
+ constructor() {
+ this.onload = null;
+ this.onerror = null;
+ this.width = 1;
+ this.height = 1;
+ this.naturalWidth = 1;
+ this.naturalHeight = 1;
+ this._src = '';
+ }
+
+ set src(value) {
+ this._src = String(value === undefined || value === null ? '' : value);
+ if (typeof this.onload === 'function') {
+ setTimeout(() => this.onload(), 0);
+ }
+ }
+
+ get src() {
+ return this._src;
+ }
+ };
+ window.HTMLImageElement = window.Image;
+
+ window.XMLSerializer = class {
+ serializeToString(node) {
+ return serializeNode(node);
+ }
+ };
+
+ return { window: window, document: document };
+}
+
+async function renderStyledQrRawData(options, format) {
+ const previousWindow = global.window;
+ const previousDocument = global.document;
+ const previousXMLSerializer = global.XMLSerializer;
+ const dom = createQrStylingWindow();
+
+ global.window = dom.window;
+ global.document = dom.document;
+ global.XMLSerializer = dom.window.XMLSerializer;
+
+ try {
+ const qrCode = new QRCodeStyling(options);
+ const blob = await qrCode.getRawData(format);
+ if (!blob) {
+ return '';
+ }
+
+ if (typeof blob === 'string') {
+ return blob;
+ }
+
+ if (typeof blob.text === 'function') {
+ return blob.text();
+ }
+
+ if (typeof blob.arrayBuffer === 'function') {
+ const buffer = await blob.arrayBuffer();
+ const bytes = new Uint8Array(buffer);
+ let binary = '';
+ for (let index = 0; index < bytes.length; index += 1) {
+ binary += String.fromCharCode(bytes[index]);
+ }
+ return binary;
+ }
+
+ return '';
+ } finally {
+ global.window = previousWindow;
+ global.document = previousDocument;
+ global.XMLSerializer = previousXMLSerializer;
+ }
+}
+
+function svgToDataUrl(svg) {
+ const markup = String(svg === undefined || svg === null ? '' : svg).trim();
+ if (!markup) {
+ return '';
+ }
+
+ return 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(markup);
+}
+
+function normalizeQrStyleColor(value, fallback) {
+ const raw = String(value === undefined || value === null ? '' : value).trim();
+ return raw || fallback;
+}
+
+function normalizeQrStyleNumber(value, fallback, min, max) {
+ const parsed = Number(value);
+ if (!Number.isFinite(parsed)) {
+ return fallback;
+ }
+
+ let next = parsed;
+ if (typeof min === 'number') {
+ next = Math.max(min, next);
+ }
+ if (typeof max === 'number') {
+ next = Math.min(max, next);
+ }
+ return next;
+}
+
+function buildQrStylingOptions(source) {
+ const text = String(source && source.value === undefined ? '' : source && source.value === null ? '' : source.value || '').trim();
+ const qrStyle = source && typeof source === 'object' ? source : {};
+ const dotsGradient = qrStyle.qr_dots_color_mode === 'gradient' ? {
+ type: String(qrStyle.qr_dots_gradient_type || 'linear').trim() || 'linear',
+ rotation: normalizeQrStyleNumber(qrStyle.qr_dots_gradient_rotation, 0, undefined, undefined),
+ colorStops: [
+ { offset: 0, color: normalizeQrStyleColor(qrStyle.qr_dots_gradient_color_1, normalizeQrStyleColor(qrStyle.qr_dots_color, '#000000')) },
+ { offset: 1, color: normalizeQrStyleColor(qrStyle.qr_dots_gradient_color_2, '#ffffff') }
+ ]
+ } : null;
+ const cornersSquareGradient = qrStyle.qr_corners_square_color_mode === 'gradient' ? {
+ type: String(qrStyle.qr_corners_square_gradient_type || 'linear').trim() || 'linear',
+ rotation: normalizeQrStyleNumber(qrStyle.qr_corners_square_gradient_rotation, 0, undefined, undefined),
+ colorStops: [
+ { offset: 0, color: normalizeQrStyleColor(qrStyle.qr_corners_square_gradient_color_1, normalizeQrStyleColor(qrStyle.qr_corners_square_color, '#000000')) },
+ { offset: 1, color: normalizeQrStyleColor(qrStyle.qr_corners_square_gradient_color_2, '#ffffff') }
+ ]
+ } : null;
+ const cornersDotGradient = qrStyle.qr_corners_dot_color_mode === 'gradient' ? {
+ type: String(qrStyle.qr_corners_dot_gradient_type || 'linear').trim() || 'linear',
+ rotation: normalizeQrStyleNumber(qrStyle.qr_corners_dot_gradient_rotation, 0, undefined, undefined),
+ colorStops: [
+ { offset: 0, color: normalizeQrStyleColor(qrStyle.qr_corners_dot_gradient_color_1, normalizeQrStyleColor(qrStyle.qr_corners_dot_color, '#000000')) },
+ { offset: 1, color: normalizeQrStyleColor(qrStyle.qr_corners_dot_gradient_color_2, '#ffffff') }
+ ]
+ } : null;
+ const backgroundGradient = qrStyle.qr_background_color_mode === 'gradient' ? {
+ type: String(qrStyle.qr_background_gradient_type || 'linear').trim() || 'linear',
+ rotation: normalizeQrStyleNumber(qrStyle.qr_background_gradient_rotation, 0, undefined, undefined),
+ colorStops: [
+ { offset: 0, color: normalizeQrStyleColor(qrStyle.qr_background_gradient_color_1, normalizeQrStyleColor(qrStyle.qr_background_color, '#ffffff')) },
+ { offset: 1, color: normalizeQrStyleColor(qrStyle.qr_background_gradient_color_2, '#ffffff') }
+ ]
+ } : null;
+
+ return {
+ width: QR_PNG_WIDTH,
+ height: QR_PNG_WIDTH,
+ type: 'canvas',
+ data: text,
+ margin: normalizeQrStyleNumber(qrStyle.qr_margin, 10, 0, undefined),
+ qrOptions: {},
+ dotsOptions: {
+ type: String(qrStyle.qr_dots_type || 'square').trim() || 'square',
+ color: normalizeQrStyleColor(qrStyle.qr_dots_color, '#000000'),
+ gradient: dotsGradient || undefined
+ },
+ cornersSquareOptions: {
+ type: String(qrStyle.qr_corners_square_type || 'square').trim() || 'square',
+ color: normalizeQrStyleColor(qrStyle.qr_corners_square_color, '#000000'),
+ gradient: cornersSquareGradient || undefined
+ },
+ cornersDotOptions: {
+ type: String(qrStyle.qr_corners_dot_type || 'square').trim() || 'square',
+ color: normalizeQrStyleColor(qrStyle.qr_corners_dot_color, '#000000'),
+ gradient: cornersDotGradient || undefined
+ },
+ backgroundOptions: {
+ color: qrStyle.qr_background_transparent ? 'transparent' : normalizeQrStyleColor(qrStyle.qr_background_color, '#ffffff'),
+ gradient: backgroundGradient || undefined
+ },
+ image: String(qrStyle.qr_image || '').trim() || undefined,
+ imageOptions: {
+ hideBackgroundDots: Boolean(qrStyle.qr_image_hide_background_dots),
+ imageSize: normalizeQrStyleNumber(qrStyle.qr_image_size, 0.4, 0, 1),
+ margin: normalizeQrStyleNumber(qrStyle.qr_image_margin, 5, 0, undefined)
+ }
+ };
+}
+
+function getQrBrowser() {
+ if (qrBrowserPromise) {
+ return qrBrowserPromise;
+ }
+
+ qrBrowserPromise = (async function () {
+ let executablePath = SYSTEM_CHROMIUM_PATHS.find(function (candidate) {
+ return fs.existsSync(candidate);
+ }) || '';
+ const usingSystemChromium = Boolean(executablePath);
+
+ if (!executablePath && chromium && typeof chromium.executablePath === 'function') {
+ executablePath = await chromium.executablePath();
+ }
+
+ if (!executablePath || !fs.existsSync(executablePath)) {
+ throw new Error('Chromium executable was not found.');
+ }
+
+ return puppeteer.launch({
+ args: usingSystemChromium
+ ? [
+ '--no-sandbox',
+ '--disable-setuid-sandbox',
+ '--disable-dev-shm-usage',
+ '--disable-gpu'
+ ]
+ : puppeteer.defaultArgs({
+ args: chromium && chromium.args ? chromium.args : [],
+ headless: 'shell'
+ }),
+ defaultViewport: usingSystemChromium
+ ? { width: QR_PNG_WIDTH, height: QR_PNG_WIDTH, deviceScaleFactor: 1 }
+ : chromium && chromium.defaultViewport ? chromium.defaultViewport : null,
+ executablePath: executablePath,
+ headless: usingSystemChromium ? true : 'shell'
+ });
+ })();
+
+ return qrBrowserPromise;
+}
+
+async function blobToDataUrl(blob) {
+ if (!blob) {
+ return '';
+ }
+
+ if (typeof blob === 'string') {
+ return blob;
+ }
+
+ if (typeof blob.arrayBuffer === 'function') {
+ const buffer = await blob.arrayBuffer();
+ const bytes = new Uint8Array(buffer);
+ let binary = '';
+ for (let index = 0; index < bytes.length; index += 1) {
+ binary += String.fromCharCode(bytes[index]);
+ }
+ return 'data:' + String(blob.type || 'image/png') + ';base64,' + Buffer.from(binary, 'binary').toString('base64');
+ }
+
+ if (typeof blob.text === 'function') {
+ return blob.text();
+ }
+
+ return '';
+}
+
+async function createStyledQrCodeDataUrl(value) {
+ const source = value && typeof value === 'object' ? value : { value: value };
+ const options = buildQrStylingOptions(source);
+ if (!options.data) {
+ return '';
+ }
+
+ return svgToDataUrl(await createStyledQrCodeSvg(options.data));
+}
+
+async function createStyledQrCodeSvg(value) {
+ const source = value && typeof value === 'object' ? value : { value: value };
+ const options = buildQrStylingOptions(source);
+ if (!options.data) {
+ return '';
+ }
+
+ return renderStyledQrRawData(options, 'svg');
+}
+
+async function createQrCodeDataUrlPlain(value) {
+ return createStyledQrCodeDataUrl(value);
+}
+
+async function createQrCodeSvg(value) {
+ return createStyledQrCodeSvg(value);
+}
+
+async function createQrCodeDataUrl(value) {
+ return createStyledQrCodeDataUrl(value);
+}
+
+async function buildQrCodeContent(value, options) {
+ const source = value && typeof value === 'object' ? value : { value: value };
+ const forcePreviewRefresh = Boolean(options && options.forcePreviewRefresh);
+ const text = String(source.value === undefined || source.value === null ? '' : source.value).trim();
+ const hasBooleanField = function (key) {
+ return Object.prototype.hasOwnProperty.call(source, key);
+ };
+ const margin = Number(source.qr_margin);
+ const normalizeHex = function (value) {
+ const raw = String(value === undefined || value === null ? '' : value).trim();
+ return raw || undefined;
+ };
+ const normalizeNumber = function (value, min, max, round) {
+ const parsed = Number(value);
+ if (!Number.isFinite(parsed)) {
+ return undefined;
+ }
+
+ let next = parsed;
+ if (round) {
+ next = Math.round(next);
+ }
+ if (typeof min === 'number') {
+ next = Math.max(min, next);
+ }
+ if (typeof max === 'number') {
+ next = Math.min(max, next);
+ }
+ return next;
+ };
+ const style = {
+ qr_margin: Number.isFinite(margin) && margin >= 0 ? Math.round(margin) : undefined,
+ qr_border_radius: Number.isFinite(Number(source.qr_border_radius)) ? Math.max(0, Math.round(Number(source.qr_border_radius))) : undefined,
+ qr_background_color: String(source.qr_background_color === undefined || source.qr_background_color === null ? '' : source.qr_background_color).trim() || undefined,
+ qr_background_transparent: hasBooleanField('qr_background_transparent') ? Boolean(source.qr_background_transparent) : undefined,
+ qr_background_color_mode: String(source.qr_background_color_mode === undefined || source.qr_background_color_mode === null ? '' : source.qr_background_color_mode).trim() || undefined,
+ qr_background_gradient_type: String(source.qr_background_gradient_type === undefined || source.qr_background_gradient_type === null ? '' : source.qr_background_gradient_type).trim() || undefined,
+ qr_background_gradient_rotation: normalizeNumber(source.qr_background_gradient_rotation),
+ qr_background_gradient_color_1: normalizeHex(source.qr_background_gradient_color_1),
+ qr_background_gradient_color_2: normalizeHex(source.qr_background_gradient_color_2),
+ qr_dots_color: String(source.qr_dots_color === undefined || source.qr_dots_color === null ? '' : source.qr_dots_color).trim() || undefined,
+ qr_dots_type: String(source.qr_dots_type === undefined || source.qr_dots_type === null ? '' : source.qr_dots_type).trim() || undefined,
+ qr_dots_color_mode: String(source.qr_dots_color_mode === undefined || source.qr_dots_color_mode === null ? '' : source.qr_dots_color_mode).trim() || undefined,
+ qr_dots_gradient_type: String(source.qr_dots_gradient_type === undefined || source.qr_dots_gradient_type === null ? '' : source.qr_dots_gradient_type).trim() || undefined,
+ qr_dots_gradient_rotation: normalizeNumber(source.qr_dots_gradient_rotation),
+ qr_dots_gradient_color_1: normalizeHex(source.qr_dots_gradient_color_1),
+ qr_dots_gradient_color_2: normalizeHex(source.qr_dots_gradient_color_2),
+ qr_corners_square_color: String(source.qr_corners_square_color === undefined || source.qr_corners_square_color === null ? '' : source.qr_corners_square_color).trim() || undefined,
+ qr_corners_square_type: String(source.qr_corners_square_type === undefined || source.qr_corners_square_type === null ? '' : source.qr_corners_square_type).trim() || undefined,
+ qr_corners_square_color_mode: String(source.qr_corners_square_color_mode === undefined || source.qr_corners_square_color_mode === null ? '' : source.qr_corners_square_color_mode).trim() || undefined,
+ qr_corners_square_gradient_type: String(source.qr_corners_square_gradient_type === undefined || source.qr_corners_square_gradient_type === null ? '' : source.qr_corners_square_gradient_type).trim() || undefined,
+ qr_corners_square_gradient_rotation: normalizeNumber(source.qr_corners_square_gradient_rotation),
+ qr_corners_square_gradient_color_1: normalizeHex(source.qr_corners_square_gradient_color_1),
+ qr_corners_square_gradient_color_2: normalizeHex(source.qr_corners_square_gradient_color_2),
+ qr_corners_dot_color: String(source.qr_corners_dot_color === undefined || source.qr_corners_dot_color === null ? '' : source.qr_corners_dot_color).trim() || undefined,
+ qr_corners_dot_type: String(source.qr_corners_dot_type === undefined || source.qr_corners_dot_type === null ? '' : source.qr_corners_dot_type).trim() || undefined,
+ qr_corners_dot_color_mode: String(source.qr_corners_dot_color_mode === undefined || source.qr_corners_dot_color_mode === null ? '' : source.qr_corners_dot_color_mode).trim() || undefined,
+ qr_corners_dot_gradient_type: String(source.qr_corners_dot_gradient_type === undefined || source.qr_corners_dot_gradient_type === null ? '' : source.qr_corners_dot_gradient_type).trim() || undefined,
+ qr_corners_dot_gradient_rotation: normalizeNumber(source.qr_corners_dot_gradient_rotation),
+ qr_corners_dot_gradient_color_1: normalizeHex(source.qr_corners_dot_gradient_color_1),
+ qr_corners_dot_gradient_color_2: normalizeHex(source.qr_corners_dot_gradient_color_2),
+ qr_image: String(source.qr_image === undefined || source.qr_image === null ? '' : source.qr_image).trim() || undefined,
+ qr_image_size: Number.isFinite(Number(source.qr_image_size)) ? Math.max(0, Math.min(1, Number(source.qr_image_size))) : undefined,
+ qr_image_margin: Number.isFinite(Number(source.qr_image_margin)) ? Math.max(0, Math.round(Number(source.qr_image_margin))) : undefined,
+ qr_image_hide_background_dots: hasBooleanField('qr_image_hide_background_dots') ? Boolean(source.qr_image_hide_background_dots) : undefined
+ };
const content = {
type: 'qr-code',
value: text
};
- if (text) {
- const svg = await createQrCodeSvg(text);
- if (svg) {
- content.qr_svg = svg;
+ Object.keys(style).forEach((key) => {
+ if (style[key] !== undefined) {
+ content[key] = style[key];
+ }
+ });
+
+ content.qr_background_use_gradient = content.qr_background_gradient_type && content.qr_background_gradient_type !== 'none';
+ content.qr_dots_use_gradient = content.qr_dots_gradient_type && content.qr_dots_gradient_type !== 'none';
+ content.qr_corners_square_use_gradient = content.qr_corners_square_gradient_type && content.qr_corners_square_gradient_type !== 'none';
+ content.qr_corners_dot_use_gradient = content.qr_corners_dot_gradient_type && content.qr_corners_dot_gradient_type !== 'none';
+
+ const svg = String(source.qr_svg === undefined || source.qr_svg === null ? '' : source.qr_svg).trim();
+ if (svg) {
+ content.qr_svg = svg;
+ }
+
+ const preview = forcePreviewRefresh ? '' : String(source.qr_preview === undefined || source.qr_preview === null ? '' : source.qr_preview).trim();
+ if (preview) {
+ content.qr_preview = preview;
+ }
+
+ if (text && !content.qr_preview) {
+ const generatedSvg = await createQrCodeSvg(text);
+ if (generatedSvg) {
+ content.qr_svg = generatedSvg;
+ }
+ const generatedDataUrl = await createStyledQrCodeDataUrl(content);
+ if (generatedDataUrl) {
+ content.qr_preview = generatedDataUrl;
}
}
@@ -32,5 +564,8 @@ async function buildQrCodeContent(value) {
module.exports = {
createQrCodeSvg,
+ createStyledQrCodeSvg,
+ createStyledQrCodeDataUrl,
+ createQrCodeDataUrl,
buildQrCodeContent
};
\ No newline at end of file
diff --git a/src/data/rss-feeds.js b/src/data/rss-feeds.js
index 7d85d67..490056b 100644
--- a/src/data/rss-feeds.js
+++ b/src/data/rss-feeds.js
@@ -2,7 +2,10 @@
const http = require('http');
const https = require('https');
-const { fetchPagedRows } = require('./utils');
+const { fetchPagedRows, validateMaxLength } = require('./utils');
+
+const NAME_MAX_LENGTH = 255;
+const URL_MAX_LENGTH = 1024;
function normalizeUpdateIntervalUnit(value) {
const unit = String(value || '').trim().toLowerCase();
@@ -255,8 +258,8 @@ async function replaceRssFeedItems(connection, rssFeedId, items) {
function buildRssFeedPayload(req, existingRssFeed) {
const fallback = existingRssFeed || {};
- const name = String(req.body.name || fallback.name || '').trim();
- const feedUrl = String(req.body.feed_url || req.body.feedUrl || fallback.feed_url || '').trim();
+ const name = validateMaxLength(req.body.name || fallback.name || '', NAME_MAX_LENGTH, 'RSS feed name');
+ const feedUrl = validateMaxLength(req.body.feed_url || req.body.feedUrl || fallback.feed_url || '', URL_MAX_LENGTH, 'RSS feed URL');
const updateIntervalValue = Math.max(1, Number(req.body.update_interval_value || req.body.updateIntervalValue || fallback.update_interval_value || 60));
const updateIntervalUnit = normalizeUpdateIntervalUnit(req.body.update_interval_unit || req.body.updateIntervalUnit || fallback.update_interval_unit || 'minutes');
const itemLimit = Math.max(1, Number(req.body.item_limit || req.body.itemLimit || fallback.item_limit || 1));
diff --git a/src/data/schedules.js b/src/data/schedules.js
index 80472ef..b1091a4 100644
--- a/src/data/schedules.js
+++ b/src/data/schedules.js
@@ -1,6 +1,9 @@
// Timetable group and entry data access helpers.
-const { fetchPagedRows } = require('./utils');
+const { fetchPagedRows, validateMaxLength } = require('./utils');
+
+const NAME_MAX_LENGTH = 255;
+const DESCRIPTION_MAX_LENGTH = 255;
function normalizeDisplayMode(value) {
const mode = String(value || 'upcoming').trim().toLowerCase();
@@ -95,8 +98,8 @@ async function fetchTimetableEntriesByGroupId(pool, timetableGroupId) {
function buildTimetableGroupPayload(req, existingTimetableGroup) {
const fallback = existingTimetableGroup || {};
- const name = String(req.body.name || fallback.name || '').trim();
- const shortDescription = String(req.body.short_description || req.body.shortDescription || fallback.short_description || '').trim();
+ const name = validateMaxLength(req.body.name || fallback.name || '', NAME_MAX_LENGTH, 'Timetable group name');
+ const shortDescription = validateMaxLength(req.body.short_description || req.body.shortDescription || fallback.short_description || '', DESCRIPTION_MAX_LENGTH, 'Timetable group description');
if (!name) {
const error = new Error('Timetable group name is required.');
diff --git a/src/data/slides.js b/src/data/slides.js
index daab94f..5f6cca0 100644
--- a/src/data/slides.js
+++ b/src/data/slides.js
@@ -1,7 +1,9 @@
// Slide data access helpers, including rich-text normalization and payload building.
const { fetchTemplateById } = require('./templates');
-const { parseJsonSafe } = require('./utils');
+const { parseJsonSafe, validateMaxLength } = require('./utils');
+
+const TITLE_MAX_LENGTH = 255;
const { buildQrCodeContent } = require('./qr-code');
const ALLOWED_RICH_TEXT_TAGS = ['b', 'strong', 'i', 'em', 'u', 'br', 'p', 'div', 'ul', 'ol', 'li'];
@@ -112,9 +114,130 @@ function getTextRegionStyle(body, region, existingContent) {
};
}
-function buildTemplateContent(template, body, filesByField, existingContent) {
+function getQrRegionStyle(body, region, existingContent) {
+ const existing = existingContent && existingContent[region.region_key] ? existingContent[region.region_key] : {};
+ const styleKeys = [
+ 'qr_margin',
+ 'qr_background_color',
+ 'qr_background_transparent',
+ 'qr_background_color_mode',
+ 'qr_background_gradient_type',
+ 'qr_background_gradient_rotation',
+ 'qr_background_gradient_color_1',
+ 'qr_background_gradient_color_2',
+ 'qr_dots_color',
+ 'qr_dots_type',
+ 'qr_dots_color_mode',
+ 'qr_dots_gradient_type',
+ 'qr_dots_gradient_rotation',
+ 'qr_dots_gradient_color_1',
+ 'qr_dots_gradient_color_2',
+ 'qr_corners_square_color',
+ 'qr_corners_square_type',
+ 'qr_corners_square_color_mode',
+ 'qr_corners_square_gradient_type',
+ 'qr_corners_square_gradient_rotation',
+ 'qr_corners_square_gradient_color_1',
+ 'qr_corners_square_gradient_color_2',
+ 'qr_corners_dot_color',
+ 'qr_corners_dot_type',
+ 'qr_corners_dot_color_mode',
+ 'qr_corners_dot_gradient_type',
+ 'qr_corners_dot_gradient_rotation',
+ 'qr_corners_dot_gradient_color_1',
+ 'qr_corners_dot_gradient_color_2',
+ 'qr_image',
+ 'qr_image_size',
+ 'qr_image_margin',
+ 'qr_image_hide_background_dots',
+ 'qr_border_radius'
+ ];
+ const style = {};
+
+ styleKeys.forEach((key) => {
+ const fieldNames = [`region_${key}_${region.id}`, `${key}_${region.id}`];
+ let fieldName = fieldNames[0];
+ let hasSubmittedValue = false;
+ let submitted;
+
+ for (let index = 0; index < fieldNames.length; index += 1) {
+ const candidate = fieldNames[index];
+ if (Object.prototype.hasOwnProperty.call(body || {}, candidate)) {
+ fieldName = candidate;
+ hasSubmittedValue = true;
+ submitted = body[candidate];
+ break;
+ }
+ }
+
+ const value = String(submitted || '').trim();
+
+ if (key === 'qr_background_transparent' || key === 'qr_image_hide_background_dots') {
+ style[key] = hasSubmittedValue;
+ return;
+ }
+
+ if (key === 'qr_background_color_mode' || key === 'qr_dots_color_mode' || key === 'qr_corners_square_color_mode' || key === 'qr_corners_dot_color_mode' || key === 'qr_background_gradient_type' || key === 'qr_dots_gradient_type' || key === 'qr_corners_square_gradient_type' || key === 'qr_corners_dot_gradient_type') {
+ style[key] = value === 'none' ? 'none' : value;
+ return;
+ }
+
+ if (key === 'qr_image') {
+ style[key] = value;
+ return;
+ }
+
+ if (submitted === undefined) {
+ if (existing[key] !== undefined && existing[key] !== null && String(existing[key]).trim() !== '') {
+ style[key] = existing[key];
+ }
+ return;
+ }
+
+ if (value !== '') {
+ if (key === 'qr_margin') {
+ const parsedMargin = Number(value);
+ if (Number.isFinite(parsedMargin)) {
+ style[key] = Math.max(0, Math.round(parsedMargin));
+ }
+ return;
+ }
+
+ if (key === 'qr_image_size') {
+ const parsedSize = Number(value);
+ if (Number.isFinite(parsedSize)) {
+ style[key] = Math.max(0, Math.min(1, parsedSize));
+ }
+ return;
+ }
+
+ if (key === 'qr_image_margin' || key === 'qr_border_radius') {
+ const parsedImageMargin = Number(value);
+ if (Number.isFinite(parsedImageMargin)) {
+ style[key] = Math.max(0, Math.round(parsedImageMargin));
+ }
+ return;
+ }
+
+ style[key] = value;
+ }
+ });
+
+ return style;
+}
+
+async function getRssFeedItemCount(pool, feedId) {
+ const [rows] = await pool.query(
+ 'SELECT COUNT(*) AS count FROM i_rss_feed_items WHERE rss_feed_id = ?',
+ [feedId]
+ );
+
+ return Number(rows && rows[0] && rows[0].count) || 0;
+}
+
+async function buildTemplateContent(pool, template, body, filesByField, existingContent) {
const content = {};
- template.regions.forEach((region) => {
+ for (const region of template.regions) {
if (region.region_type === 'image') {
const uploaded = filesByField[`region_image_${region.id}`];
const existing = body[`existing_region_image_${region.id}`];
@@ -144,12 +267,22 @@ function buildTemplateContent(template, body, filesByField, existingContent) {
value: submitted === undefined ? current : String(submitted || '').trim()
};
} else if (region.region_type === 'qr-code') {
+ const uploadedImage = filesByField[`region_qr_image_${region.id}`];
const submitted = body[`region_qr_code_${region.id}`];
+ const submittedSvg = body[`region_qr_svg_${region.id}`];
+ const submittedPreview = body[`region_qr_preview_${region.id}`];
+ const existingImage = body[`existing_region_qr_image_${region.id}`];
const current = existingContent && existingContent[region.region_key] ? existingContent[region.region_key] : {};
const nextValue = submitted === undefined ? String(current.value !== undefined ? current.value : current.qr_code || '').trim() : String(submitted || '').trim();
+ const qrStyle = getQrRegionStyle(body, region, existingContent);
+ delete qrStyle.qr_image;
content[region.region_key] = {
type: 'qr-code',
- value: nextValue
+ value: nextValue,
+ qr_svg: submittedSvg === undefined ? String(current.qr_svg || '').trim() : String(submittedSvg || '').trim(),
+ qr_preview: submittedPreview === undefined ? String(current.qr_preview || '').trim() : String(submittedPreview || '').trim(),
+ qr_image: uploadedImage ? `/media/uploads/${uploadedImage.filename}` : String(existingImage === undefined ? String(current.qr_image || '').trim() : String(existingImage || '').trim()),
+ ...qrStyle
};
} else if (region.region_type === 'rtmp') {
const submitted = body[`region_rtmp_${region.id}`];
@@ -182,11 +315,13 @@ function buildTemplateContent(template, body, filesByField, existingContent) {
const feedId = body[`region_rss_feed_id_${region.id}`];
const itemNumber = body[`region_rss_item_number_${region.id}`];
const parsedItemNumber = Math.max(1, Number(itemNumber || current.item_number || 1));
+ const normalizedFeedId = feedId === undefined || feedId === null || feedId === '' ? Number(current.feed_id || 0) : Number(feedId);
+ const itemCount = normalizedFeedId > 0 ? Math.max(1, await getRssFeedItemCount(pool, normalizedFeedId) || 1) : 1;
content[region.region_key] = {
type: 'rss',
value: stripEditorOnlyMarkup(normalizeEditorMarkup(submitted === undefined ? String(current.value || '') : String(submitted || ''))),
feed_id: feedId === undefined || feedId === null || feedId === '' ? (current.feed_id || null) : Number(feedId),
- item_number: Number.isFinite(parsedItemNumber) && parsedItemNumber > 0 ? parsedItemNumber : 1,
+ item_number: Math.min(itemCount, Number.isFinite(parsedItemNumber) && parsedItemNumber > 0 ? parsedItemNumber : 1),
variable_name: 'item',
font_family: style.font_family,
font_size: style.font_size,
@@ -258,12 +393,12 @@ function buildTemplateContent(template, body, filesByField, existingContent) {
font_color: style.font_color
};
}
- });
+ }
return content;
}
async function buildSlidePayload(pool, req, existingSlide) {
- const title = String(req.body.title || '').trim();
+ const title = validateMaxLength(req.body.title || '', TITLE_MAX_LENGTH, 'Slide title');
const templateId = req.body.template_id ? Number(req.body.template_id) : null;
const filesByField = getFilesByField(req.files || []);
const template = templateId ? await fetchTemplateById(pool, templateId) : null;
@@ -282,7 +417,7 @@ async function buildSlidePayload(pool, req, existingSlide) {
}
if (template) {
- const content = buildTemplateContent(template, req.body, filesByField, existingContent);
+ const content = await buildTemplateContent(pool, template, req.body, filesByField, existingContent);
await Promise.all(Object.keys(content).map(async function (regionKey) {
const region = template.regions.find(function (item) {
return String(item.region_key || '').trim() === regionKey;
@@ -291,7 +426,7 @@ async function buildSlidePayload(pool, req, existingSlide) {
return;
}
- content[regionKey] = await buildQrCodeContent(content[regionKey].value);
+ content[regionKey] = await buildQrCodeContent(content[regionKey]);
}));
return {
diff --git a/src/data/templates.js b/src/data/templates.js
index 17d5d08..87f375b 100644
--- a/src/data/templates.js
+++ b/src/data/templates.js
@@ -1,8 +1,11 @@
// Template data access helpers and region normalization logic.
-const { parseJsonSafe, readFormArray } = require('./utils');
+const { parseJsonSafe, readFormArray, validateMaxLength } = require('./utils');
const animationPresets = require('../web/public/js/templates/animation-presets');
+const TEMPLATE_NAME_MAX_LENGTH = 255;
+const REGION_NAME_MAX_LENGTH = 255;
+
function sanitizeBackgroundColor(value) {
const raw = String(value || '').trim();
if (/^#[0-9a-fA-F]{6}$/.test(raw) || /^#[0-9a-fA-F]{3}$/.test(raw)) {
@@ -137,10 +140,11 @@ function extractTemplateRegions(body) {
if (Array.isArray(parsed)) {
return parsed.map((region) => {
const regionType = normalizeTemplateRegionType(region.region_type);
+ const regionName = validateMaxLength(region.region_name || region.region_key || region.label || '', REGION_NAME_MAX_LENGTH, 'Region name');
return {
- region_key: String(region.region_name || region.region_key || region.label || '').trim(),
+ region_key: regionName,
region_type: regionType,
- label: String(region.region_name || region.label || region.region_key || '').trim(),
+ label: regionName,
lock_ratio: normalizeTemplateRegionLockRatio(region.lock_ratio),
animation_json: normalizeTemplateRegionAnimationConfig(region.animation_json),
x: Number(region.x || 0),
@@ -167,7 +171,7 @@ function extractTemplateRegions(body) {
const regions = [];
for (let i = 0; i < keys.length; i += 1) {
- const name = String(names[i] || keys[i] || labels[i] || '').trim();
+ const name = validateMaxLength(names[i] || keys[i] || labels[i] || '', REGION_NAME_MAX_LENGTH, 'Region name');
const rawType = String(types[i] || 'text').trim();
const regionType = normalizeTemplateRegionType(rawType);
if (!name) {
@@ -236,7 +240,7 @@ function getFilesByField(files) {
}
async function buildTemplatePayload(pool, req, existingTemplate) {
- const name = String(req.body.name || '').trim();
+ const name = validateMaxLength(req.body.name || '', TEMPLATE_NAME_MAX_LENGTH, 'Template name');
const canvasSizeId = req.body.canvas_size_id ? Number(req.body.canvas_size_id) : null;
let canvasWidth = Math.max(1, Number((existingTemplate && existingTemplate.canvas_size_width) || 1920));
let canvasHeight = Math.max(1, Number((existingTemplate && existingTemplate.canvas_size_height) || 1080));
diff --git a/src/data/utils.js b/src/data/utils.js
index 3411050..55b4091 100644
--- a/src/data/utils.js
+++ b/src/data/utils.js
@@ -24,6 +24,26 @@ function readFormArray(body, key) {
return [body[key]];
}
+function validateMaxLength(value, maxLength, fieldName) {
+ const text = String(value || '').trim();
+ const limit = Number(maxLength);
+ if (Number.isFinite(limit) && limit > 0 && text.length > limit) {
+ const error = new Error(fieldName + ' must be ' + limit + ' characters or fewer.');
+ error.statusCode = 400;
+ throw error;
+ }
+ return text;
+}
+
+function truncateToMaxLength(value, maxLength) {
+ const text = String(value || '').trim();
+ const limit = Number(maxLength);
+ if (!Number.isFinite(limit) || limit <= 0 || text.length <= limit) {
+ return text;
+ }
+ return text.slice(0, limit);
+}
+
function normalizePageNumber(value) {
const pageNumber = Math.floor(Number(value) || 1);
return Math.max(1, pageNumber);
@@ -201,6 +221,75 @@ function findTopLevelWhereIndex(sql) {
return lastWhereIndex;
}
+function findTopLevelGroupByIndex(sql) {
+ const text = String(sql || '');
+ let depth = 0;
+ let inSingleQuote = false;
+ let inDoubleQuote = false;
+ let inBacktick = false;
+ let lastGroupByIndex = -1;
+
+ for (let index = 0; index < text.length; index += 1) {
+ const character = text[index];
+ const previousCharacter = index > 0 ? text[index - 1] : '';
+
+ if (inSingleQuote) {
+ if (character === '\'' && previousCharacter !== '\\') {
+ inSingleQuote = false;
+ }
+ continue;
+ }
+
+ if (inDoubleQuote) {
+ if (character === '"' && previousCharacter !== '\\') {
+ inDoubleQuote = false;
+ }
+ continue;
+ }
+
+ if (inBacktick) {
+ if (character === '`') {
+ inBacktick = false;
+ }
+ continue;
+ }
+
+ if (character === '\'') {
+ inSingleQuote = true;
+ continue;
+ }
+
+ if (character === '"') {
+ inDoubleQuote = true;
+ continue;
+ }
+
+ if (character === '`') {
+ inBacktick = true;
+ continue;
+ }
+
+ if (character === '(') {
+ depth += 1;
+ continue;
+ }
+
+ if (character === ')' && depth > 0) {
+ depth -= 1;
+ continue;
+ }
+
+ if (depth === 0 && /[gG]/.test(character)) {
+ const remaining = text.slice(index);
+ if (/^group\s+by\b/i.test(remaining)) {
+ lastGroupByIndex = index;
+ }
+ }
+ }
+
+ return lastGroupByIndex;
+}
+
function buildSearchFilter(searchColumns, searchTerm) {
const columns = Array.isArray(searchColumns) ? searchColumns.map(function (column) {
return String(column || '').trim();
@@ -238,17 +327,24 @@ async function fetchPagedRows(pool, options) {
throw new Error('fetchPagedRows requires selectSql and countSql.');
}
const orderByIndex = findTopLevelOrderByIndex(selectSql);
+ const groupByIndex = findTopLevelGroupByIndex(selectSql);
let baseSelectSql = selectSql;
let orderBySql = '';
+ let groupBySql = '';
if (orderByIndex >= 0) {
baseSelectSql = selectSql.slice(0, orderByIndex).trim();
orderBySql = selectSql.slice(orderByIndex).trim();
}
+ if (groupByIndex >= 0 && (orderByIndex < 0 || groupByIndex < orderByIndex)) {
+ baseSelectSql = selectSql.slice(0, groupByIndex).trim();
+ groupBySql = selectSql.slice(groupByIndex, orderByIndex >= 0 ? orderByIndex : selectSql.length).trim();
+ }
+
const hasTopLevelWhere = findTopLevelWhereIndex(baseSelectSql) >= 0;
const searchClause = searchFilter.clause ? (hasTopLevelWhere ? searchFilter.clause.replace(/^\s*WHERE\s+/i, ' AND ') : searchFilter.clause) : '';
- const filteredSelectSql = `${baseSelectSql}${searchClause}`;
+ const filteredSelectSql = `${baseSelectSql}${searchClause}${groupBySql ? ' ' + groupBySql : ''}`;
const countQuery = searchFilter.clause
? `SELECT COUNT(*) AS count FROM (${filteredSelectSql}) AS filtered_rows`
: countSql;
@@ -294,10 +390,13 @@ async function fetchDuplicateName(pool, tableName, name, excludeId, columnName)
module.exports = {
parseJsonSafe,
readFormArray,
+ validateMaxLength,
+ truncateToMaxLength,
normalizePageNumber,
normalizeSortDirection,
buildSortOrderClause,
findTopLevelOrderByIndex,
+ findTopLevelGroupByIndex,
buildSearchFilter,
fetchPagedRows,
fetchDuplicateName
diff --git a/src/player.js b/src/player.js
index 40050f8..448192c 100644
--- a/src/player.js
+++ b/src/player.js
@@ -46,8 +46,7 @@ async function start() {
playerRuntime: playerRuntime,
onboardingStore: onboardingStore,
playerPublicBaseUrl: PLAYER_PUBLIC_BASE_URL,
- playerInternalBaseUrl: PLAYER_INTERNAL_BASE_URL,
- QRCode: require('qrcode')
+ playerInternalBaseUrl: PLAYER_INTERNAL_BASE_URL
});
registerPlayerRoutes(app, {
pool: pool,
@@ -77,7 +76,6 @@ async function start() {
async function syncDatabaseState() {
try {
await common.ensureSchema(pool, { mediaDir: MEDIA_DIR });
- await common.bootstrapDatabase(pool);
if (playerRuntime.snapshotAllConnections().length > 0) {
await common.pruneStaleOnboardingDevices(pool);
diff --git a/src/player/announcement-templates/lower-third.template.html b/src/player/announcement-templates/lower-third.template.html
index a47e5e9..d4a402a 100644
--- a/src/player/announcement-templates/lower-third.template.html
+++ b/src/player/announcement-templates/lower-third.template.html
@@ -99,7 +99,6 @@
display: inline-flex;
align-items: center;
gap: 2.5rem;
- min-width: 100%;
width: max-content;
backface-visibility: hidden;
will-change: transform;
@@ -148,7 +147,7 @@
transform: translate3d(0, 0, 0);
}
to {
- transform: translate3d(-50%, 0, 0);
+ transform: translate3d(calc(-1 * var(--announcement-scroll-distance, 0px)), 0, 0);
}
}
@@ -178,21 +177,10 @@
}
var track = root.querySelector('.player-announcement__message-track');
- if (!track) {
+ if (!track || typeof window.initPlayerAnnouncementMarquee !== 'function') {
return;
}
- if (track.dataset.marqueeMeasured === 'true') {
- return;
- }
-
- var rate = Number(track.getAttribute('data-announcement-marquee-rate') || 44) || 44;
- var singlePassWidth = Math.max(1, track.scrollWidth / 2);
- var durationSeconds = Math.max(8, singlePassWidth / rate);
- var durationValue = durationSeconds.toFixed(2) + 's';
-
- track.dataset.marqueeMeasured = 'true';
- track.style.setProperty('--announcement-scroll-duration', durationValue);
- track.style.animationDuration = durationValue;
+ window.initPlayerAnnouncementMarquee(track, { container: root.querySelector('.player-announcement__message') || root });
}());
\ No newline at end of file
diff --git a/src/player/announcement-templates/top-banner.template.html b/src/player/announcement-templates/top-banner.template.html
index dbe6447..a8f1c92 100644
--- a/src/player/announcement-templates/top-banner.template.html
+++ b/src/player/announcement-templates/top-banner.template.html
@@ -101,7 +101,6 @@
display: inline-flex;
align-items: center;
gap: 2.5rem;
- min-width: 100%;
width: max-content;
backface-visibility: hidden;
will-change: transform;
@@ -150,7 +149,7 @@
transform: translate3d(0, 0, 0);
}
to {
- transform: translate3d(-50%, 0, 0);
+ transform: translate3d(calc(-1 * var(--announcement-scroll-distance, 0px)), 0, 0);
}
}
@@ -180,21 +179,10 @@
}
var track = root.querySelector('.player-announcement__message-track');
- if (!track) {
+ if (!track || typeof window.initPlayerAnnouncementMarquee !== 'function') {
return;
}
- if (track.dataset.marqueeMeasured === 'true') {
- return;
- }
-
- var rate = Number(track.getAttribute('data-announcement-marquee-rate') || 44) || 44;
- var singlePassWidth = Math.max(1, track.scrollWidth / 2);
- var durationSeconds = Math.max(8, singlePassWidth / rate);
- var durationValue = durationSeconds.toFixed(2) + 's';
-
- track.dataset.marqueeMeasured = 'true';
- track.style.setProperty('--announcement-scroll-duration', durationValue);
- track.style.animationDuration = durationValue;
+ window.initPlayerAnnouncementMarquee(track, { container: root.querySelector('.player-announcement__message') || root });
}());
\ No newline at end of file
diff --git a/src/player/onboarding/index.js b/src/player/onboarding/index.js
index 77cac9c..df4256b 100644
--- a/src/player/onboarding/index.js
+++ b/src/player/onboarding/index.js
@@ -1,6 +1,7 @@
// Player onboarding routes and signup flow helpers.
const { isClientNameAvailable, withClientNameReservation } = require('#src/data/client-name-check');
+const { createStyledQrCodeSvg } = require('#src/data/qr-code');
const { getSharedSecret, verifyPageAuthToken } = require('#src/request-auth');
const { isTransientDbError } = require('./store');
@@ -222,11 +223,10 @@ function registerPlayerOnboardingRoutes(app, options) {
const pool = options && options.pool ? options.pool : null;
const common = options && options.common ? options.common : null;
const playerRuntime = options && options.playerRuntime ? options.playerRuntime : null;
- const QRCode = options && options.QRCode ? options.QRCode : null;
const onboardingStore = options && options.onboardingStore ? options.onboardingStore : null;
- if (!app || !pool || !common || !playerRuntime || !QRCode) {
- throw new Error('registerPlayerOnboardingRoutes requires app, pool, common, playerRuntime, and QRCode.');
+ if (!app || !pool || !common || !playerRuntime) {
+ throw new Error('registerPlayerOnboardingRoutes requires app, pool, common, and playerRuntime.');
}
const sharedSecret = getSharedSecret();
@@ -303,7 +303,7 @@ function registerPlayerOnboardingRoutes(app, options) {
return res.status(400).json({ error: 'Device ID is required' });
}
const onboardingUrl = `${getPublicBaseUrl(req, options && options.playerPublicBaseUrl)}/onboard?deviceId=${encodeURIComponent(deviceId)}`;
- const svg = await QRCode.toString(onboardingUrl, { type: 'svg', margin: 1, errorCorrectionLevel: 'M' });
+ const svg = await createStyledQrCodeSvg({ value: onboardingUrl, qr_margin: 20 });
res.set('Content-Type', 'image/svg+xml; charset=utf-8');
res.set('Cache-Control', 'no-store');
res.send(svg);
diff --git a/src/player/playlist.js b/src/player/playlist.js
index b61d053..3a58a47 100644
--- a/src/player/playlist.js
+++ b/src/player/playlist.js
@@ -3,6 +3,7 @@
const crypto = require('crypto');
const fs = require('fs');
const path = require('path');
+const { createStyledQrCodeDataUrl } = require('../data/qr-code');
function createPlayerPlaylistService(options) {
const pool = options && options.pool ? options.pool : null;
@@ -56,6 +57,10 @@ function createPlayerPlaylistService(options) {
await fs.promises.writeFile(filePath, JSON.stringify(payload, null, 2), 'utf8');
}
+ async function createQrPreviewDataUrl(value) {
+ return createStyledQrCodeDataUrl(value);
+ }
+
async function buildScreenPlaylist(slug) {
try {
const [screenRows] = await pool.query('SELECT id, name, slug, playlist_id, created_at, modified_at, created_by, modified_by FROM d_screens WHERE slug = ?', [slug]);
@@ -150,12 +155,13 @@ function createPlayerPlaylistService(options) {
}
}
- const slides = slideRows.map(function (slide) {
+ const slides = await Promise.all(slideRows.map(async function (slide) {
const storedDuration = Number(slide.duration_seconds || 0);
const videoDuration = slide.use_video_duration ? getVideoRegionDurationSeconds(slide.content_json) : null;
const disableAudio = slide.disable_audio === undefined || slide.disable_audio === null ? true : Boolean(slide.disable_audio);
const videoCacheBust = String(slide.modified_at || slide.content_json || slide.id || '');
const content = common.parseJsonSafe(slide.content_json) || {};
+ const qrBackfillTasks = [];
Object.keys(content).forEach(function (key) {
const region = content[key];
if (region && typeof region === 'object') {
@@ -168,6 +174,27 @@ function createPlayerPlaylistService(options) {
region.cache_bust = videoCacheBust;
}
});
+
+ Object.keys(content).forEach(function (key) {
+ const region = content[key];
+ if (!region || typeof region !== 'object' || String(region.type || '').trim().toLowerCase() !== 'qr-code') {
+ return;
+ }
+
+ if (region.qr_preview && /^data:image\//i.test(String(region.qr_preview || '').trim())) {
+ return;
+ }
+
+ qrBackfillTasks.push(createQrPreviewDataUrl(region.value).then(function (preview) {
+ if (preview) {
+ region.qr_preview = preview;
+ }
+ return null;
+ }).catch(function () {
+ return null;
+ }));
+ });
+ await Promise.all(qrBackfillTasks);
return {
id: slide.id,
title: slide.title,
@@ -180,7 +207,7 @@ function createPlayerPlaylistService(options) {
template: slide.template_id ? templatesById[slide.template_id] || null : null,
content: content
};
- });
+ }));
let rssFeeds = [];
if (typeof common.fetchRssFeedsData === 'function' && typeof common.fetchRssFeedItemsByFeedId === 'function') {
diff --git a/src/player/public/css/player.css b/src/player/public/css/player.css
index 872ab37..4fe8725 100644
--- a/src/player/public/css/player.css
+++ b/src/player/public/css/player.css
@@ -116,6 +116,8 @@ body.thumbnail-preview .player-offline-banner {
display: block;
background: #fff;
border-radius: 18px;
+ padding: 16px;
+ box-sizing: border-box;
}
.onboarding-form {
diff --git a/src/player/public/js/player-announcement-templates.js b/src/player/public/js/player-announcement-templates.js
index 9255263..c77361a 100644
--- a/src/player/public/js/player-announcement-templates.js
+++ b/src/player/public/js/player-announcement-templates.js
@@ -54,12 +54,68 @@
});
}
+ function getComputedGapWidth(track) {
+ if (!track || !window.getComputedStyle) {
+ return 0;
+ }
+
+ var computedStyle = window.getComputedStyle(track);
+ var gapValue = String(computedStyle.columnGap || computedStyle.gap || '0').trim();
+ var gap = Number.parseFloat(gapValue);
+ return Number.isFinite(gap) ? gap : 0;
+ }
+
+ function getElementWidth(element) {
+ if (!element || !element.getBoundingClientRect) {
+ return 0;
+ }
+
+ return Math.max(0, element.getBoundingClientRect().width || 0);
+ }
+
+ function initPlayerAnnouncementMarquee(track, options) {
+ if (!track || track.dataset.marqueeMeasured === 'true') {
+ return;
+ }
+
+ var settings = options || {};
+ var rate = Number(settings.rate || track.getAttribute('data-announcement-marquee-rate') || 44) || 44;
+ var textSelector = String(settings.textSelector || '.player-announcement__message-text').trim() || '.player-announcement__message-text';
+ var textNodes = Array.prototype.slice.call(track.querySelectorAll(textSelector));
+ if (!textNodes.length) {
+ return;
+ }
+
+ var container = settings.container || track.parentElement || track;
+ var containerWidth = Math.max(1, getElementWidth(container) || 0);
+ var gapWidth = getComputedGapWidth(track);
+ var firstItemWidth = Math.max(1, getElementWidth(textNodes[0]) || 0);
+ var cycleWidth = Math.max(1, firstItemWidth + gapWidth);
+ var minimumTrackWidth = Math.max(containerWidth + cycleWidth, cycleWidth * 2);
+ var cloneIndex = 0;
+
+ while (getElementWidth(track) < minimumTrackWidth && cloneIndex < 8) {
+ var clone = textNodes[cloneIndex % textNodes.length].cloneNode(true);
+ clone.setAttribute('aria-hidden', 'true');
+ track.appendChild(clone);
+ cloneIndex += 1;
+ }
+
+ var durationSeconds = Math.max(8, cycleWidth / rate);
+ var durationValue = durationSeconds.toFixed(2) + 's';
+
+ track.dataset.marqueeMeasured = 'true';
+ track.style.setProperty('--announcement-scroll-distance', cycleWidth.toFixed(2) + 'px');
+ track.style.setProperty('--announcement-scroll-duration', durationValue);
+ track.style.animationDuration = durationValue;
+ }
+
function renderPlayerAnnouncementMarkup(announcement) {
var normalizedType = normalizeAnnouncementType(announcement && announcement.announcement_type);
var colorKey = normalizeAnnouncementColor(announcement && announcement.color_key);
var colorTokens = getAnnouncementColorTokens(colorKey);
var iconKey = normalizeAnnouncementIcon(announcement && announcement.icon_key);
- var text = escapeHtml(String(announcement && announcement.message || '').trim()).replace(/\n/g, '
');
+ var text = escapeHtml(String(announcement && announcement.message || '').trim()).replace(/[\r\n]+/g, ' ');
var titleText = escapeHtml(String(announcement && announcement.short_label || 'Announcement').trim() || 'Announcement');
var templates = window.playerAnnouncementTemplates || {};
var templateName = normalizedType === 'fullscreen' ? 'fullscreen' : normalizedType === 'top-banner' ? 'topBanner' : 'lowerThird';
@@ -77,4 +133,5 @@
}
window.renderPlayerAnnouncementMarkup = renderPlayerAnnouncementMarkup;
+ window.initPlayerAnnouncementMarquee = initPlayerAnnouncementMarquee;
})();
\ No newline at end of file
diff --git a/src/player/regions/qr-code.js b/src/player/regions/qr-code.js
index d692b87..da537bc 100644
--- a/src/player/regions/qr-code.js
+++ b/src/player/regions/qr-code.js
@@ -3,14 +3,18 @@
var registry = window.pulsePlayerRegionTypes;
function renderQrCodeRegion(region, regionContent) {
- var svg = String(regionContent && regionContent.qr_svg || '').trim();
- if (!svg) {
+ var borderRadius = Math.max(0, Math.round(Number(regionContent && regionContent.qr_border_radius || 0)));
+ var radiusStyle = borderRadius > 0 ? 'border-radius:' + borderRadius + 'px;overflow:hidden;' : '';
+ var preview = String(regionContent && regionContent.qr_preview || '').trim();
+
+ if (!preview) {
return '';
}
- return '
 + ')
';
+ return ' + ')
';
}
registry.register('qr-code', {
- renderRegion: renderQrCodeRegion
+ renderRegion: renderQrCodeRegion,
+ initRegion: function () {}
});
\ No newline at end of file
diff --git a/src/player/regions/text.js b/src/player/regions/text.js
index 3b17b19..e2b235b 100644
--- a/src/player/regions/text.js
+++ b/src/player/regions/text.js
@@ -40,7 +40,7 @@ function renderTextRegion(region, regionContent) {
var fontFamily = sanitizeFontFamily(regionContent.font_family || region.fontFamily || defaultStyle.font_family);
var fontSize = sanitizeFontSize(regionContent.font_size || region.fontSize || defaultStyle.font_size);
var fontColor = sanitizeTextColor(regionContent.font_color || region.fontColor || defaultStyle.font_color);
- var contentStyle = 'width:' + region.pixelWidth + 'px;height:' + region.pixelHeight + 'px;transform:scale(' + region.canvasScale + ');transform-origin:top left;' + (fontFamily ? 'font-family:' + escapeHtml(fontFamily) + ';' : '') + 'font-size:' + fontSize + 'px;color:' + escapeHtml(fontColor) + ';';
+ var contentStyle = 'width:' + region.pixelWidth + 'px;height:' + region.pixelHeight + 'px;transform:scale(' + region.canvasScale + ');transform-origin:top left;line-height:1.5;' + (fontFamily ? 'font-family:' + escapeHtml(fontFamily) + ';' : '') + 'font-size:' + fontSize + 'px;color:' + escapeHtml(fontColor) + ';';
var renderedBody = renderEditorJsContent(rawValue);
return renderedBody ? '' : '';
}
diff --git a/src/player/render-helpers.js b/src/player/render-helpers.js
index 864adee..12a1196 100644
--- a/src/player/render-helpers.js
+++ b/src/player/render-helpers.js
@@ -442,8 +442,9 @@ function getPlayerRegionScriptPaths() {
function getPlayerRegionScripts() {
const sharedPlaceholderUtilsPath = path.join(__dirname, '..', 'web', 'public', 'js', 'shared', 'placeholder-utils.js');
+ const sharedQrSvgUtilsPath = path.join(__dirname, '..', 'web', 'public', 'js', 'shared', 'qr-code-svg.js');
const playerRegionScriptPaths = getPlayerRegionScriptPaths();
- const scriptPaths = [sharedPlaceholderUtilsPath].concat(playerRegionScriptPaths);
+ const scriptPaths = [sharedPlaceholderUtilsPath, sharedQrSvgUtilsPath].concat(playerRegionScriptPaths);
const statSignature = scriptPaths.map(function (filePath) {
return fs.statSync(filePath).mtimeMs;
}).join('|');
diff --git a/src/rbac.js b/src/rbac.js
index d39bf90..99d5918 100644
--- a/src/rbac.js
+++ b/src/rbac.js
@@ -2,202 +2,215 @@
const PERMISSION_SECTIONS = [
{
- key: 'dashboard',
+ sectionName: 'Main navigation',
order: 10,
- name: 'Dashboard',
- sectionName: 'Main navigation',
- actions: [
- { key: 'read', name: 'Read', description: 'Access the dashboard overview.' },
- { key: 'allow', name: 'Allow', description: 'Send global player commands.' }
+ permissions: [
+ {
+ key: 'dashboard',
+ order: 10,
+ name: 'Dashboard',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'Access the dashboard overview.' },
+ { key: 'allow', name: 'Allow', description: 'Send global player commands.' }
+ ]
+ },
+ {
+ key: 'clients',
+ order: 20,
+ name: 'Connected clients',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View connected player clients and live status.' },
+ { key: 'allow', name: 'Allow', description: 'Use the connected client command buttons.' }
+ ]
+ }
]
},
{
- key: 'clients',
+ sectionName: 'Content',
order: 20,
- name: 'Connected clients',
- sectionName: 'Main navigation',
- actions: [
- { key: 'read', name: 'Read', description: 'View connected player clients and live status.' },
- { key: 'allow', name: 'Allow', description: 'Use the connected client command buttons.' }
+ permissions: [
+ {
+ key: 'screens',
+ order: 10,
+ name: 'Screens',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View the screen list and open screen details.' },
+ { key: 'create', name: 'Create', description: 'Create new screens.' },
+ { key: 'update', name: 'Update', description: 'Update screens.' },
+ { key: 'delete', name: 'Delete', description: 'Delete screens.' }
+ ]
+ },
+ {
+ key: 'playlists',
+ order: 20,
+ name: 'Playlists',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View playlists and playlist contents.' },
+ { key: 'create', name: 'Create', description: 'Create new playlists.' },
+ { key: 'update', name: 'Update', description: 'Update playlists and playlist slides.' },
+ { key: 'delete', name: 'Delete', description: 'Delete playlists.' }
+ ]
+ },
+ {
+ key: 'slides',
+ order: 30,
+ name: 'Slides',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View slides.' },
+ { key: 'create', name: 'Create', description: 'Create new slides.' },
+ { key: 'update', name: 'Update', description: 'Update slide content.' },
+ { key: 'delete', name: 'Delete', description: 'Delete slides.' }
+ ]
+ },
+ {
+ key: 'templates',
+ order: 40,
+ name: 'Slide templates',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View slide templates.' },
+ { key: 'create', name: 'Create', description: 'Create new slide templates.' },
+ { key: 'update', name: 'Update', description: 'Update slide templates.' },
+ { key: 'delete', name: 'Delete', description: 'Delete slide templates.' }
+ ]
+ },
+ {
+ key: 'canvas-sizes',
+ order: 50,
+ name: 'Canvas sizes',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View canvas sizes.' },
+ { key: 'create', name: 'Create', description: 'Create new canvas sizes.' },
+ { key: 'update', name: 'Update', description: 'Update canvas sizes.' },
+ { key: 'delete', name: 'Delete', description: 'Delete canvas sizes.' }
+ ]
+ },
+ {
+ key: 'announcements',
+ order: 60,
+ name: 'Announcements',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View announcements.' },
+ { key: 'create', name: 'Create', description: 'Create new announcements.' },
+ { key: 'update', name: 'Update', description: 'Update announcements.' },
+ { key: 'delete', name: 'Delete', description: 'Delete announcements.' }
+ ]
+ }
]
},
{
- key: 'screens',
+ sectionName: 'Data Sources',
order: 30,
- name: 'Screens',
- sectionName: 'Content',
- actions: [
- { key: 'read', name: 'Read', description: 'View the screen list and open screen details.' },
- { key: 'create', name: 'Create', description: 'Create new screens.' },
- { key: 'update', name: 'Update', description: 'Update screens.' },
- { key: 'delete', name: 'Delete', description: 'Delete screens.' }
+ permissions: [
+ {
+ key: 'rss-feeds',
+ order: 10,
+ name: 'RSS feeds',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View configured RSS feeds.' },
+ { key: 'create', name: 'Create', description: 'Create new RSS feeds.' },
+ { key: 'update', name: 'Update', description: 'Update RSS feeds.' },
+ { key: 'delete', name: 'Delete', description: 'Delete RSS feeds.' }
+ ]
+ },
+ {
+ key: 'api-sources',
+ order: 20,
+ name: 'API sources',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View configured API sources.' },
+ { key: 'create', name: 'Create', description: 'Create new API sources.' },
+ { key: 'update', name: 'Update', description: 'Update API sources.' },
+ { key: 'delete', name: 'Delete', description: 'Delete API sources.' }
+ ]
+ },
+ {
+ key: 'timetables',
+ order: 30,
+ name: 'Timetables',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View configured timetable groups.' },
+ { key: 'create', name: 'Create', description: 'Create new timetable groups.' },
+ { key: 'update', name: 'Update', description: 'Update timetable groups and entries.' },
+ { key: 'delete', name: 'Delete', description: 'Delete timetable groups.' }
+ ]
+ }
]
},
{
- key: 'playlists',
+ sectionName: 'Settings',
order: 40,
- name: 'Playlists',
- sectionName: 'Content',
- actions: [
- { key: 'read', name: 'Read', description: 'View playlists and playlist contents.' },
- { key: 'create', name: 'Create', description: 'Create new playlists.' },
- { key: 'update', name: 'Update', description: 'Update playlists and playlist slides.' },
- { key: 'delete', name: 'Delete', description: 'Delete playlists.' }
- ]
- },
- {
- key: 'slides',
- order: 50,
- name: 'Slides',
- sectionName: 'Content',
- actions: [
- { key: 'read', name: 'Read', description: 'View slides.' },
- { key: 'create', name: 'Create', description: 'Create new slides.' },
- { key: 'update', name: 'Update', description: 'Update slide content.' },
- { key: 'delete', name: 'Delete', description: 'Delete slides.' }
- ]
- },
- {
- key: 'templates',
- order: 60,
- name: 'Slide templates',
- sectionName: 'Content',
- actions: [
- { key: 'read', name: 'Read', description: 'View slide templates.' },
- { key: 'create', name: 'Create', description: 'Create new slide templates.' },
- { key: 'update', name: 'Update', description: 'Update slide templates.' },
- { key: 'delete', name: 'Delete', description: 'Delete slide templates.' }
- ]
- },
- {
- key: 'canvas-sizes',
- order: 70,
- name: 'Canvas sizes',
- sectionName: 'Content',
- actions: [
- { key: 'read', name: 'Read', description: 'View canvas sizes.' },
- { key: 'create', name: 'Create', description: 'Create new canvas sizes.' },
- { key: 'update', name: 'Update', description: 'Update canvas sizes.' },
- { key: 'delete', name: 'Delete', description: 'Delete canvas sizes.' }
- ]
- },
- {
- key: 'announcements',
- order: 80,
- name: 'Announcements',
- sectionName: 'Content',
- actions: [
- { key: 'read', name: 'Read', description: 'View announcements.' },
- { key: 'create', name: 'Create', description: 'Create new announcements.' },
- { key: 'update', name: 'Update', description: 'Update announcements.' },
- { key: 'delete', name: 'Delete', description: 'Delete announcements.' }
- ]
- },
- {
- key: 'rss-feeds',
- order: 90,
- name: 'RSS feeds',
- sectionName: 'Data Sources',
- actions: [
- { key: 'read', name: 'Read', description: 'View configured RSS feeds.' },
- { key: 'create', name: 'Create', description: 'Create new RSS feeds.' },
- { key: 'update', name: 'Update', description: 'Update RSS feeds.' },
- { key: 'delete', name: 'Delete', description: 'Delete RSS feeds.' }
- ]
- },
- {
- key: 'api-sources',
- order: 100,
- name: 'API sources',
- sectionName: 'Data Sources',
- actions: [
- { key: 'read', name: 'Read', description: 'View configured API sources.' },
- { key: 'create', name: 'Create', description: 'Create new API sources.' },
- { key: 'update', name: 'Update', description: 'Update API sources.' },
- { key: 'delete', name: 'Delete', description: 'Delete API sources.' }
- ]
- },
- {
- key: 'timetables',
- order: 110,
- name: 'Timetables',
- sectionName: 'Data Sources',
- actions: [
- { key: 'read', name: 'Read', description: 'View configured timetable groups.' },
- { key: 'create', name: 'Create', description: 'Create new timetable groups.' },
- { key: 'update', name: 'Update', description: 'Update timetable groups and entries.' },
- { key: 'delete', name: 'Delete', description: 'Delete timetable groups.' }
- ]
- },
- {
- key: 'users',
- order: 120,
- name: 'Users',
- sectionName: 'Settings',
- actions: [
- { key: 'read', name: 'Read', description: 'View users and role assignments.' },
- { key: 'create', name: 'Create', description: 'Create new users.' },
- { key: 'update', name: 'Update', description: 'Update users, passwords, and role assignments.' },
- { key: 'delete', name: 'Delete', description: 'Delete users.' }
- ]
- },
- {
- key: 'rbac',
- order: 130,
- name: 'Roles and permissions',
- sectionName: 'Settings',
- actions: [
- { key: 'read', name: 'Read', description: 'View roles and permissions.' },
- { key: 'create', name: 'Create', description: 'Create new roles.' },
- { key: 'update', name: 'Update', description: 'Update role details and permissions.' },
- { key: 'delete', name: 'Delete', description: 'Delete roles.' }
- ]
- },
- {
- key: 'fonts',
- order: 140,
- name: 'Fonts',
- sectionName: 'Settings',
- actions: [
- { key: 'read', name: 'Read', description: 'View managed fonts.' },
- { key: 'create', name: 'Create', description: 'Upload managed fonts.' },
- { key: 'delete', name: 'Delete', description: 'Remove managed fonts.' }
- ]
- },
- {
- key: 'background-tasks',
- order: 150,
- name: 'Task Queue',
- sectionName: 'Settings',
- actions: [
- { key: 'read', name: 'Read', description: 'View queued background tasks.' },
- { key: 'allow', name: 'Allow', description: 'Manage queued background tasks and clear finished items.' }
- ]
- },
- {
- key: 'scheduled-tasks',
- order: 160,
- name: 'Scheduled tasks',
- sectionName: 'Settings',
- actions: [
- { key: 'read', name: 'Read', description: 'View scheduled refresh tasks.' },
- { key: 'allow', name: 'Allow', description: 'Run scheduled refreshes manually.' }
+ permissions: [
+ {
+ key: 'users',
+ order: 10,
+ name: 'Users',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View users and role assignments.' },
+ { key: 'create', name: 'Create', description: 'Create new users.' },
+ { key: 'update', name: 'Update', description: 'Update users, passwords, and role assignments.' },
+ { key: 'delete', name: 'Delete', description: 'Delete users.' }
+ ]
+ },
+ {
+ key: 'rbac',
+ order: 20,
+ name: 'Roles and permissions',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View roles and permissions.' },
+ { key: 'create', name: 'Create', description: 'Create new roles.' },
+ { key: 'update', name: 'Update', description: 'Update role details and permissions.' },
+ { key: 'delete', name: 'Delete', description: 'Delete roles.' }
+ ]
+ },
+ {
+ key: 'fonts',
+ order: 30,
+ name: 'Fonts',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View managed fonts.' },
+ { key: 'create', name: 'Create', description: 'Upload managed fonts.' },
+ { key: 'delete', name: 'Delete', description: 'Remove managed fonts.' }
+ ]
+ },
+ {
+ key: 'background-tasks',
+ order: 40,
+ name: 'Task Queue',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View queued background tasks.' },
+ { key: 'allow', name: 'Allow', description: 'Manage queued background tasks and clear finished items.' }
+ ]
+ },
+ {
+ key: 'scheduled-tasks',
+ order: 50,
+ name: 'Scheduled tasks',
+ permissions: [
+ { key: 'read', name: 'Read', description: 'View scheduled refresh tasks.' },
+ { key: 'allow', name: 'Allow', description: 'Run scheduled refreshes manually.' }
+ ]
+ }
]
}
];
const PERMISSIONS = PERMISSION_SECTIONS.flatMap(function (section) {
- return section.actions.map(function (action) {
- return {
- key: `${section.key}.${action.key}`,
- name: section.name,
- sectionOrder: section.order,
- actionName: action.name,
- sectionName: section.sectionName,
- sectionKey: section.key,
- actionKey: action.key,
- description: action.description
- };
+ return (Array.isArray(section.permissions) ? section.permissions : []).flatMap(function (resource) {
+ return (Array.isArray(resource.permissions) ? resource.permissions : []).map(function (action, index) {
+ return {
+ key: `${resource.key}.${action.key}`,
+ name: resource.name,
+ sectionOrder: section.order,
+ actionName: action.name,
+ permissionOrder: index + 1,
+ sectionName: section.sectionName,
+ resourceKey: resource.key,
+ resourceOrder: resource.order,
+ resourceName: resource.name,
+ actionKey: action.key,
+ description: action.description
+ };
+ });
});
});
diff --git a/src/web.js b/src/web.js
index 03f3949..d3872b8 100644
--- a/src/web.js
+++ b/src/web.js
@@ -6,7 +6,7 @@ const multer = require('multer');
const fs = require('fs');
const crypto = require('crypto');
const common = require('./common');
-const { verifyPassword, createSessionToken, hashSessionToken, hashPassword } = require('#src/auth');
+const { verifyPassword, createSessionToken, hashSessionToken, hashPassword, validatePasswordStrength } = require('#src/auth');
const pages = require('#src/web/pages');
const registerMiddleware = require('#src/web/middleware');
const { createBackgroundTaskQueue } = require('#src/web/lib/background-tasks/queue');
@@ -131,6 +131,7 @@ async function start() {
formatDashboardDate: formatDashboardDate,
getAuditUserId: getAuditUserId,
hashPassword: hashPassword,
+ validatePasswordStrength: validatePasswordStrength,
readArrayField: readArrayField,
rbacData: rbacData,
fetchOrderedPlaylistSlides: fetchOrderedPlaylistSlides,
diff --git a/src/web/handlebars.js b/src/web/handlebars.js
index 7b484a9..438699f 100644
--- a/src/web/handlebars.js
+++ b/src/web/handlebars.js
@@ -28,6 +28,15 @@ function registerGeneralHelpers(Handlebars) {
return `${text.slice(0, Math.max(0, limit - 1)).trimEnd()}…`;
});
+
+ Handlebars.registerHelper('textLengthAttrs', function (maxLength) {
+ const limit = Number(maxLength);
+ if (!Number.isFinite(limit) || limit < 1) {
+ return '';
+ }
+
+ return new Handlebars.SafeString(`maxlength="${Handlebars.escapeExpression(String(Math.floor(limit)))}" data-limit-text-length`);
+ });
}
// URL helpers for generating links and external URL checks.
@@ -112,12 +121,14 @@ function registerActionHelpers(Handlebars) {
label: String(hash.deleteLabel || 'Delete'),
className: String(hash.deleteClass || 'btn btn-danger'),
url: String(hash.deleteUrl || '').trim(),
+ formId: String(hash.deleteFormId || '').trim(),
confirmMessage: String(hash.deleteConfirmMessage || '').trim(),
disabled: hash.deleteDisabled === undefined ? false : String(hash.deleteDisabled).toLowerCase() !== 'false',
title: String(hash.deleteTitle || '')
};
const resolvedDeleteUrl = deleteAction.url || (!deleteAction.disabled && saveUrl ? saveUrl.replace(/\/+$/, '') + '/delete' : '');
+ const resolvedDeleteFormId = deleteAction.formId || '';
if (!formId) {
return '';
@@ -141,10 +152,11 @@ function registerActionHelpers(Handlebars) {
}
if (showDelete && (deleteAction.disabled || resolvedDeleteUrl)) {
- const deleteActionAttr = resolvedDeleteUrl ? ` data-delete-action-url="${escape(resolvedDeleteUrl)}"` : '';
+ const deleteActionAttr = resolvedDeleteUrl && !resolvedDeleteFormId ? ` data-delete-action-url="${escape(resolvedDeleteUrl)}"` : '';
+ const deleteFormAttr = resolvedDeleteFormId ? ` form="${escape(resolvedDeleteFormId)}"` : '';
const confirmAttr = deleteAction.confirmMessage ? ` data-confirm-message="${escape(deleteAction.confirmMessage)}"` : '';
const titleAttr = deleteAction.disabled && deleteAction.title ? ` title="${escape(deleteAction.title)}"` : '';
- parts.push(``);
+ parts.push(``);
}
parts.push('');
diff --git a/src/web/lib/auth/session.js b/src/web/lib/auth/session.js
index 61eda43..e8edc08 100644
--- a/src/web/lib/auth/session.js
+++ b/src/web/lib/auth/session.js
@@ -2,6 +2,35 @@
const { normalizePermissionKeys } = require('#src/rbac');
+function getRequestOrigin(req) {
+ const forwardedProto = String(req && req.headers && req.headers['x-forwarded-proto'] || '').trim().split(',')[0];
+ const protocol = forwardedProto || (req && req.socket && req.socket.encrypted ? 'https' : 'http');
+ const forwardedHost = String(req && req.headers && req.headers['x-forwarded-host'] || '').trim().split(',')[0];
+ const host = forwardedHost || String(req && req.headers && req.headers.host || '').trim();
+ return host ? `${protocol}://${host}`.replace(/\/$/, '') : 'http://localhost';
+}
+
+function normalizeReturnToPath(value, baseUrl) {
+ const rawValue = String(value || '').trim();
+ if (!rawValue) {
+ return '';
+ }
+
+ const normalizedBaseUrl = String(baseUrl || '').trim().replace(/\/$/, '') || 'http://localhost';
+
+ try {
+ const parsed = new URL(rawValue, normalizedBaseUrl);
+ const baseOrigin = new URL(normalizedBaseUrl).origin;
+ if (parsed.origin !== baseOrigin) {
+ return '';
+ }
+
+ return parsed.pathname + parsed.search + parsed.hash;
+ } catch (_error) {
+ return rawValue.charAt(0) === '/' ? rawValue : '';
+ }
+}
+
function createSessionService(options) {
const sessionCookieName = String(options && options.sessionCookieName || '').trim();
const sessionMaxAgeMs = Number(options && options.sessionMaxAgeMs);
@@ -142,7 +171,8 @@ function createSessionService(options) {
return next();
}
setAuthMessageCookie(res, 'Please sign in to continue.');
- res.redirect('/login');
+ const returnTo = normalizeReturnToPath(req && (req.originalUrl || req.url || req.path), getRequestOrigin(req));
+ res.redirect(returnTo ? '/login?returnTo=' + encodeURIComponent(returnTo) : '/login');
}
return {
@@ -154,8 +184,9 @@ function createSessionService(options) {
consumeAuthMessageCookie: consumeAuthMessageCookie,
loadCurrentUser: loadCurrentUser,
createUserSession: createUserSession,
- requireAuth: requireAuth
+ requireAuth: requireAuth,
+ getRequestOrigin: getRequestOrigin
};
}
-module.exports = { createSessionService };
\ No newline at end of file
+ module.exports = { createSessionService, normalizeReturnToPath, getRequestOrigin };
\ No newline at end of file
diff --git a/src/web/lib/media/slide-thumbnails.js b/src/web/lib/media/slide-thumbnails.js
index 6a4f8a2..e8580f9 100644
--- a/src/web/lib/media/slide-thumbnails.js
+++ b/src/web/lib/media/slide-thumbnails.js
@@ -115,9 +115,11 @@ function buildRegionInnerHtml(region, regionContent, baseUrl) {
}
if (regionType === 'qr-code') {
- const src = String(regionContent.qr_svg || rawValue || regionContent.qr_code || '').trim();
+ const src = String(regionContent.qr_preview || '').trim();
+ const borderRadius = Math.max(0, Math.round(Number(regionContent.qr_border_radius || 0)));
+ const radiusStyle = borderRadius > 0 ? ' style="border-radius:' + borderRadius + 'px;overflow:hidden;"' : '';
return src
- ? '
'
+ ? '
'
: '';
}
diff --git a/src/web/middleware.js b/src/web/middleware.js
index fd819bd..eff0b12 100644
--- a/src/web/middleware.js
+++ b/src/web/middleware.js
@@ -2,7 +2,6 @@
const express = require('express');
const fs = require('fs');
-const path = require('path');
module.exports = function registerMiddleware(app, deps) {
const pool = deps.pool;
@@ -12,12 +11,10 @@ module.exports = function registerMiddleware(app, deps) {
const uploadsDir = deps.UPLOADS_DIR;
const thumbnailsDir = deps.THUMBNAILS_DIR;
const assetDir = deps.ASSET_DIR;
- const qrcodeGeneratorDir = path.join(__dirname, '..', '..', 'node_modules', 'qrcode-generator', 'dist');
app.use(express.urlencoded({ extended: true }));
app.use(express.json());
app.use('/assets', express.static(assetDir));
- app.use('/assets/vendor/qrcode-generator', express.static(qrcodeGeneratorDir));
app.use('/media', express.static(mediaDir));
fs.mkdirSync(uploadsDir, { recursive: true });
fs.mkdirSync(thumbnailsDir, { recursive: true });
diff --git a/src/web/public/css/theme-custom.css b/src/web/public/css/theme-custom.css
index ebd03f9..5294ce8 100644
--- a/src/web/public/css/theme-custom.css
+++ b/src/web/public/css/theme-custom.css
@@ -259,6 +259,10 @@
opacity: 0.84;
}
+.rbac-permissions-table tbody tr:last-child > * {
+ border-bottom-width: 0;
+}
+
.template-designer-form--previewing .region-item [disabled],
.template-designer-form--previewing .template-details-card [disabled],
.template-designer-form--previewing .template-options-card [disabled],
@@ -270,15 +274,33 @@
position: relative;
}
+.announcement-type-picker {
+ position: relative;
+}
+
.announcement-icon-picker__toggle {
display: flex;
align-items: center;
gap: 0.75rem;
width: 100%;
- min-height: calc(1.5em + 0.75rem + 2px);
+ min-height: calc(2.375rem + 2px);
padding: 0.375rem 0.75rem;
border: 1px solid var(--bs-border-color);
- border-radius: 0.375rem;
+ border-radius: 0.875rem;
+ background: var(--bs-body-bg);
+ color: var(--bs-body-color);
+ text-align: left;
+}
+
+.announcement-type-picker__toggle {
+ display: flex;
+ align-items: center;
+ gap: 0.75rem;
+ width: 100%;
+ min-height: calc(2.375rem + 2px);
+ padding: 0.375rem 0.75rem;
+ border: 1px solid var(--bs-border-color);
+ border-radius: 0.875rem;
background: var(--bs-body-bg);
color: var(--bs-body-color);
text-align: left;
@@ -289,23 +311,73 @@
box-shadow: 0 0 0 0.2rem rgba(var(--bs-primary-rgb), 0.25);
}
+.announcement-type-picker__toggle:focus-visible {
+ outline: 0;
+ box-shadow: 0 0 0 0.2rem rgba(var(--bs-primary-rgb), 0.25);
+}
+
.announcement-icon-picker__toggle-icon {
display: inline-flex;
align-items: center;
justify-content: center;
width: 1.75rem;
height: 1.75rem;
- border-radius: 0.5rem;
+ border-radius: 0.7rem;
background: rgba(var(--bs-primary-rgb), 0.1);
color: var(--bs-primary);
font-size: 1rem;
flex: 0 0 auto;
}
-.announcement-icon-picker__toggle-label {
+.announcement-type-picker__toggle-icon {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 1.75rem;
+ height: 1.75rem;
+ border-radius: 0.7rem;
+ background: rgba(var(--bs-primary-rgb), 0.1);
+ color: var(--bs-primary);
+ font-size: 1rem;
+ flex: 0 0 auto;
+}
+
+.announcement-icon-picker__toggle-content {
+ display: flex;
+ flex-direction: column;
+ gap: 0.1rem;
flex: 1 1 auto;
min-width: 0;
+}
+
+.announcement-type-picker__toggle-content {
+ display: flex;
+ flex-direction: column;
+ gap: 0.1rem;
+ flex: 1 1 auto;
+ min-width: 0;
+}
+
+.announcement-icon-picker__toggle-label {
font-weight: 600;
+ line-height: 1.1;
+}
+
+.announcement-type-picker__toggle-label {
+ font-weight: 600;
+ line-height: 1.1;
+}
+
+.announcement-icon-picker__toggle-hint {
+ color: var(--bs-secondary-color);
+ font-size: 0.78rem;
+ line-height: 1.1;
+}
+
+.announcement-type-picker__toggle-hint {
+ color: var(--bs-secondary-color);
+ font-size: 0.78rem;
+ line-height: 1.1;
}
.announcement-icon-picker__caret {
@@ -314,6 +386,12 @@
font-size: 0.8rem;
}
+.announcement-type-picker__caret {
+ flex: 0 0 auto;
+ color: var(--bs-secondary-color);
+ font-size: 0.8rem;
+}
+
.announcement-icon-picker__menu {
position: absolute;
z-index: 20;
@@ -329,6 +407,26 @@
box-shadow: 0 1rem 2rem rgba(15, 23, 42, 0.18);
}
+.announcement-type-picker__menu {
+ position: absolute;
+ z-index: 20;
+ top: calc(100% + 0.5rem);
+ bottom: auto;
+ left: 0;
+ width: min(100%, 28rem);
+ max-width: calc(100vw - 1rem);
+ padding: 0.75rem;
+ border: 1px solid var(--bs-border-color);
+ border-radius: 1rem;
+ background: var(--bs-body-bg);
+ box-shadow: 0 1rem 2rem rgba(15, 23, 42, 0.18);
+}
+
+.announcement-type-picker__menu.is-open-above {
+ top: auto;
+ bottom: calc(100% + 0.5rem);
+}
+
.announcement-icon-picker__menu.is-open-above {
top: auto;
bottom: calc(100% + 0.5rem);
@@ -350,6 +448,12 @@
gap: 0.5rem;
}
+.announcement-type-picker__grid {
+ display: grid;
+ grid-template-columns: repeat(auto-fill, minmax(8rem, 1fr));
+ gap: 0.5rem;
+}
+
.announcement-icon-picker__option {
display: inline-flex;
align-items: center;
@@ -363,6 +467,20 @@
transition: transform 120ms ease, border-color 120ms ease, background-color 120ms ease, box-shadow 120ms ease;
}
+.announcement-type-picker__option {
+ display: flex;
+ flex-direction: column;
+ align-items: stretch;
+ gap: 0.5rem;
+ padding: 0.5rem;
+ border: 1px solid var(--bs-border-color);
+ border-radius: 0.75rem;
+ background: var(--bs-body-bg);
+ color: var(--bs-body-color);
+ text-align: left;
+ transition: transform 120ms ease, border-color 120ms ease, background-color 120ms ease, box-shadow 120ms ease;
+}
+
.announcement-icon-picker__option:hover,
.announcement-icon-picker__option:focus-visible {
border-color: rgba(var(--bs-primary-rgb), 0.7);
@@ -371,6 +489,14 @@
transform: translateY(-1px);
}
+.announcement-type-picker__option:hover,
+.announcement-type-picker__option:focus-visible {
+ border-color: rgba(var(--bs-primary-rgb), 0.7);
+ background: rgba(var(--bs-primary-rgb), 0.04);
+ box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.15);
+ transform: translateY(-1px);
+}
+
.announcement-icon-picker__option.is-selected {
border-color: var(--bs-primary);
background: rgba(var(--bs-primary-rgb), 0.12);
@@ -378,11 +504,154 @@
box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.12);
}
+.announcement-type-picker__option.is-selected {
+ border-color: var(--bs-primary);
+ box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.12);
+}
+
.announcement-icon-picker__option i {
font-size: 1.05rem;
line-height: 1;
}
+.announcement-type-picker__option-icon {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 2.5rem;
+ border-radius: 0.65rem;
+ background: rgba(var(--bs-primary-rgb), 0.1);
+ color: var(--bs-primary);
+ font-size: 1rem;
+}
+
+.announcement-type-picker__option-icon i {
+ line-height: 1;
+}
+
+.announcement-type-picker__label {
+ font-size: 0.8rem;
+ font-weight: 600;
+ line-height: 1.1;
+ text-align: center;
+}
+
+.announcement-screen-picker {
+ display: grid;
+ grid-template-columns: minmax(0, 1fr);
+ gap: 0.5rem;
+ max-height: 18rem;
+ padding: 0.25rem;
+ overflow: auto;
+}
+
+.announcement-screen-actions {
+ display: flex;
+ flex-wrap: wrap;
+ gap: 0.5rem;
+ margin-bottom: 0.5rem;
+}
+
+.announcement-screen-action {
+ flex: 1 1 9rem;
+}
+
+.announcement-screen-option {
+ position: relative;
+ min-width: 0;
+}
+
+.announcement-screen-option > .btn-check {
+ position: absolute;
+ inset: 0;
+ margin: 0;
+}
+
+.announcement-screen-chip {
+ display: flex;
+ align-items: center;
+ justify-content: flex-start;
+ gap: 0.5rem;
+ width: 100%;
+ min-height: 2.5rem;
+ padding: 0.5rem 0.75rem;
+ border: 1px solid var(--bs-border-color);
+ border-radius: 0.875rem;
+ background: var(--bs-body-bg);
+ color: var(--bs-body-color);
+ cursor: pointer;
+ transition: transform 120ms ease, border-color 120ms ease, background-color 120ms ease, box-shadow 120ms ease;
+}
+
+.announcement-screen-chip:hover,
+.announcement-screen-chip:focus-visible {
+ border-color: rgba(var(--bs-primary-rgb), 0.7);
+ background: rgba(var(--bs-primary-rgb), 0.04);
+ box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.12);
+ transform: translateY(-1px);
+}
+
+.announcement-screen-option > .btn-check:checked + .announcement-screen-chip {
+ border-color: var(--bs-primary);
+ background: rgba(var(--bs-primary-rgb), 0.08);
+ box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.12);
+}
+
+.announcement-screen-chip__check {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ margin-left: auto;
+ width: 1.25rem;
+ height: 1.25rem;
+ border-radius: 999px;
+ background: rgba(var(--bs-primary-rgb), 0.1);
+ color: var(--bs-primary);
+ opacity: 0;
+ transform: scale(0.85);
+ transition: opacity 120ms ease, transform 120ms ease, background-color 120ms ease, color 120ms ease;
+}
+
+.announcement-screen-chip__check-icon {
+ font-size: 0.9rem;
+ line-height: 1;
+}
+
+.announcement-screen-option > .btn-check:checked + .announcement-screen-chip .announcement-screen-chip__check {
+ opacity: 1;
+ transform: scale(1);
+}
+
+.announcement-screen-chip__text {
+ display: block;
+ flex: 1 1 auto;
+ min-width: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ font-size: 0.875rem;
+ font-weight: 700;
+ line-height: 1.2;
+}
+
+@media (max-width: 576px) {
+ .announcement-screen-picker {
+ max-height: 16rem;
+ }
+}
+
+@media (max-width: 576px) {
+ .announcement-type-picker__menu {
+ width: calc(100vw - 2rem);
+ right: 0;
+ left: auto;
+ }
+
+ .announcement-type-picker__grid {
+ grid-template-columns: repeat(auto-fill, minmax(7rem, 1fr));
+ }
+}
+
@media (max-width: 576px) {
.announcement-icon-picker__menu {
width: calc(100vw - 2rem);
@@ -1844,6 +2113,83 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
border-radius: var(--bs-border-radius);
}
+.announcement-color-picker {
+ display: grid;
+ gap: 0.75rem;
+}
+
+.announcement-color-picker__grid {
+ display: grid;
+ grid-template-columns: repeat(8, minmax(0, 1fr));
+ gap: 0.375rem;
+}
+
+.announcement-color-picker__option {
+ display: flex;
+ flex-direction: column;
+ align-items: stretch;
+ gap: 0.375rem;
+ padding: 0.375rem;
+ border: 1px solid var(--bs-border-color);
+ border-radius: 0.75rem;
+ background: var(--bs-body-bg);
+ color: var(--bs-body-color);
+ text-align: left;
+ transition: transform 120ms ease, border-color 120ms ease, background-color 120ms ease, box-shadow 120ms ease;
+}
+
+.announcement-color-picker__option:hover,
+.announcement-color-picker__option:focus-visible {
+ border-color: rgba(var(--bs-primary-rgb), 0.7);
+ background: rgba(var(--bs-primary-rgb), 0.04);
+ box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.15);
+ transform: translateY(-1px);
+}
+
+.announcement-color-picker__option.is-selected {
+ border-color: var(--bs-primary);
+ box-shadow: 0 0 0 0.15rem rgba(var(--bs-primary-rgb), 0.12);
+}
+
+.announcement-color-picker__swatch {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 2.5rem;
+ border-radius: 0.65rem;
+ font-size: 1rem;
+}
+
+.announcement-color-picker__check {
+ opacity: 0;
+ transform: scale(0.8);
+ transition: opacity 120ms ease, transform 120ms ease;
+}
+
+.announcement-color-picker__option.is-selected .announcement-color-picker__check {
+ opacity: 1;
+ transform: scale(1);
+}
+
+.announcement-color-picker__label {
+ font-size: 0.8rem;
+ font-weight: 600;
+ line-height: 1.1;
+ text-align: center;
+}
+
+@media (max-width: 1200px) {
+ .announcement-color-picker__grid {
+ grid-template-columns: repeat(4, minmax(0, 1fr));
+ }
+}
+
+@media (max-width: 768px) {
+ .announcement-color-picker__grid {
+ grid-template-columns: repeat(2, minmax(0, 1fr));
+ }
+}
+
.announcement-icon-preview {
display: flex;
align-items: center;
@@ -1871,7 +2217,8 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
display: grid;
gap: 0.5rem;
padding-top: 0.25rem;
- margin-bottom: 0.75rem;
+ padding-bottom: 0.5rem;
+ margin-bottom: 0;
}
.api-region-placeholder-title {
@@ -2220,6 +2567,50 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
flex: 1 1 0;
}
+.schedule-day-grid .schedule-day-option {
+ position: relative;
+ display: flex;
+ flex: 1 1 0;
+ min-width: 0;
+}
+
+.schedule-day-grid .schedule-day-option > .btn-check {
+ position: absolute;
+ inset: 0;
+ margin: 0;
+}
+
+.schedule-day-grid .schedule-day-option > .schedule-day-button {
+ width: 100%;
+ border-radius: 0;
+}
+
+.schedule-day-grid .schedule-day-option:first-child > .schedule-day-button {
+ border-top-left-radius: var(--bs-btn-border-radius);
+ border-bottom-left-radius: var(--bs-btn-border-radius);
+}
+
+.schedule-day-grid .schedule-day-option:last-child > .schedule-day-button {
+ border-top-right-radius: var(--bs-btn-border-radius);
+ border-bottom-right-radius: var(--bs-btn-border-radius);
+}
+
+.schedule-day-grid .schedule-day-option + .schedule-day-option {
+ margin-left: -1px;
+}
+
+.schedule-day-grid .schedule-day-button.is-invalid {
+ color: var(--bs-danger);
+ border-color: var(--bs-danger);
+ background-color: rgba(var(--bs-danger-rgb), 0.08);
+}
+
+.schedule-day-grid .btn-check:checked + .schedule-day-button.is-invalid {
+ color: #fff;
+ border-color: var(--bs-danger);
+ background-color: var(--bs-danger);
+}
+
.slide-schedule-dialog {
position: fixed;
top: 50%;
@@ -2283,11 +2674,9 @@ html[data-bs-theme='dark'] .template-field-card .tox .tox-collection {
overflow: hidden;
}
-.slide-schedule-content .schedule-rule-card.collapsed-card > .card-body {
- display: block !important;
- padding: 0 !important;
- max-height: 0;
- overflow: hidden;
+.slide-schedule-content .schedule-rule-card.collapsed-card > .card-body,
+.slide-schedule-content .schedule-rule-card.collapsed-card > .card-footer {
+ display: none;
}
.slide-schedule-content .schedule-rule-card.collapsed-card .card-header {
@@ -2332,8 +2721,18 @@ td[data-label="Actions"] > div {
}
.playlist-duration-input {
- width: 6rem;
- min-width: 6rem;
+ width: 4rem !important;
+ min-width: 4rem !important;
+ flex: 0 0 4rem !important;
+}
+
+.playlist-duration-input-group {
+ display: inline-flex !important;
+ flex: 0 0 auto !important;
+ width: fit-content !important;
+ max-width: fit-content !important;
+ border-radius: var(--bs-border-radius-sm);
+ overflow: hidden;
}
.playlist-duration-input::-webkit-outer-spin-button,
@@ -2356,6 +2755,13 @@ td[data-label="Actions"] > div {
text-align: left;
}
+.playlist-duration-prefix {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ flex: 0 0 auto;
+}
+
.playlist-use-video-duration {
white-space: nowrap;
}
@@ -2424,13 +2830,24 @@ table.table > :not(caption) > * > * {
.playlist-order-cell {
width: 1%;
white-space: nowrap;
+ vertical-align: top;
+ padding-top: 0 !important;
padding-bottom: 0 !important;
}
.playlist-order-cell-inner {
- display: inline-flex;
+ display: flex;
align-items: center;
- gap: 0.5rem;
+ width: 100%;
+ gap: 0.65rem;
+}
+
+.playlist-order-stepper {
+ display: inline-flex;
+ flex-direction: column;
+ align-items: center;
+ justify-content: center;
+ gap: 0.02rem;
}
.playlist-drag-handle {
@@ -2438,26 +2855,46 @@ table.table > :not(caption) > * > * {
align-items: center;
justify-content: center;
width: 1.35rem;
- height: 1.9rem;
+ height: 1.35rem;
line-height: 1;
- cursor: grab;
+ cursor: grab !important;
text-decoration: none;
touch-action: none;
}
+.playlist-drag-handle:hover,
+.playlist-drag-handle:focus {
+ cursor: grab !important;
+}
+
+.playlist-drag-handle:active,
+.playlist-drag-handle[aria-grabbed="true"] {
+ cursor: grabbing !important;
+}
+
.playlist-drag-handle-icon {
display: inline-flex;
align-items: center;
justify-content: center;
width: 1.1rem;
- height: 1.9rem;
+ height: 1.1rem;
+ font-size: 1rem;
+ line-height: 1;
}
-.playlist-drag-handle-svg {
- display: block;
- width: 100%;
- height: 100%;
- fill: currentColor;
+.playlist-order-move {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ width: 1.15rem;
+ height: 1.15rem;
+ line-height: 1;
+ text-decoration: none;
+}
+
+.playlist-order-move:hover,
+.playlist-order-move:focus {
+ text-decoration: none;
}
.playlist-drag-handle:active,
diff --git a/src/web/public/js/admin/admin-page.js b/src/web/public/js/admin/admin-page.js
index 9f971e3..a48ec98 100644
--- a/src/web/public/js/admin/admin-page.js
+++ b/src/web/public/js/admin/admin-page.js
@@ -157,10 +157,14 @@
return Boolean(form && form.dataset && form.dataset.dirty === 'true');
}
+ function isRegionEditorField(target) {
+ return Boolean(target && typeof target.closest === 'function' && target.closest('.region-item'));
+ }
+
function initDirtyTracking() {
document.addEventListener('input', function (event) {
var target = event.target;
- if (!target || !target.form) {
+ if (!target || !target.form || isRegionEditorField(target)) {
return;
}
markFormDirty(target.form);
@@ -168,13 +172,101 @@
document.addEventListener('change', function (event) {
var target = event.target;
- if (!target || !target.form) {
+ if (!target || !target.form || isRegionEditorField(target)) {
return;
}
markFormDirty(target.form);
}, true);
}
+ function clampLimitedInputValue(input) {
+ if (!input || !input.matches || !input.matches('input[data-limit-input-value]')) {
+ return;
+ }
+
+ var minAttr = input.getAttribute('min');
+ var maxAttr = input.getAttribute('max');
+ var minValue = minAttr === null || minAttr === '' ? null : Number(minAttr);
+ var maxValue = maxAttr === null || maxAttr === '' ? null : Number(maxAttr);
+ var rawValue = String(input.value || '').trim();
+
+ if (!rawValue) {
+ return;
+ }
+
+ var numericValue = Number(rawValue);
+ if (!Number.isFinite(numericValue)) {
+ return;
+ }
+
+ if (Number.isFinite(minValue) && numericValue < minValue) {
+ input.value = String(minValue);
+ return;
+ }
+
+ if (Number.isFinite(maxValue) && numericValue > maxValue) {
+ input.value = String(maxValue);
+ }
+ }
+
+ function initLimitedInputValues() {
+ document.addEventListener('input', function (event) {
+ clampLimitedInputValue(event.target);
+ }, true);
+
+ document.addEventListener('change', function (event) {
+ clampLimitedInputValue(event.target);
+ }, true);
+
+ document.addEventListener('paste', function (event) {
+ var target = event.target;
+ if (!target || !target.matches || !target.matches('input[data-limit-input-value]')) {
+ return;
+ }
+
+ window.setTimeout(function () {
+ clampLimitedInputValue(target);
+ }, 0);
+ }, true);
+ }
+
+ function clampLimitedTextValue(input) {
+ if (!input || !input.matches || !input.matches('input[data-limit-text-length], textarea[data-limit-text-length]')) {
+ return;
+ }
+
+ var maxLength = Number(input.getAttribute('maxlength'));
+ if (!Number.isFinite(maxLength) || maxLength < 1) {
+ return;
+ }
+
+ var value = String(input.value || '');
+ if (value.length > maxLength) {
+ input.value = value.slice(0, maxLength);
+ }
+ }
+
+ function initLimitedTextInputValues() {
+ document.addEventListener('input', function (event) {
+ clampLimitedTextValue(event.target);
+ }, true);
+
+ document.addEventListener('change', function (event) {
+ clampLimitedTextValue(event.target);
+ }, true);
+
+ document.addEventListener('paste', function (event) {
+ var target = event.target;
+ if (!target || !target.matches || !target.matches('input[data-limit-text-length], textarea[data-limit-text-length]')) {
+ return;
+ }
+
+ window.setTimeout(function () {
+ clampLimitedTextValue(target);
+ }, 0);
+ }, true);
+ }
+
function initCancelConfirm() {
document.addEventListener('click', function (event) {
var cancelTarget = event.target.closest('[data-confirm-unsaved]');
@@ -219,6 +311,15 @@
return String(responseText || '').trim();
}
+ function isWarningSaveError(error) {
+ var status = Number(error && error.status);
+ if (status === 400 || status === 422) {
+ return true;
+ }
+
+ return /region names must be unique/i.test(String(error && error.message || ''));
+ }
+
function getAsyncSaveActionField(form) {
if (!form || !form.querySelector) {
return null;
@@ -312,7 +413,9 @@
if (!response.ok) {
var responseText = await response.text();
- throw new Error(parseAsyncSaveErrorMessage(responseText) || (settings.errorMessage || 'Unable to save changes.'));
+ var error = new Error(parseAsyncSaveErrorMessage(responseText) || (settings.errorMessage || 'Unable to save changes.'));
+ error.status = response.status;
+ throw error;
}
if (isLoginRedirect(response)) {
@@ -363,11 +466,25 @@
})
: parseAsyncSaveResponseMessage(responseText);
- showToast(successMessage || String(settings.fallbackSuccessMessage || 'Saved.'), 'success');
+ var resolvedSuccessMessage = successMessage || String(settings.fallbackSuccessMessage || 'Saved.');
+
+ if (form.dataset && form.dataset.asyncSaveRefreshPage === 'true') {
+ if (typeof window.queueToastAfterRefresh === 'function') {
+ window.queueToastAfterRefresh(resolvedSuccessMessage, 'success');
+ } else if (typeof showToast === 'function') {
+ showToast(resolvedSuccessMessage, 'success');
+ }
+ window.setTimeout(function () {
+ window.location.reload();
+ }, 1000);
+ return true;
+ }
+
+ showToast(resolvedSuccessMessage, 'success');
return true;
} catch (error) {
if (typeof showToast === 'function') {
- var variant = Number(error && error.status) >= 400 && Number(error && error.status) < 500 ? 'warning' : 'danger';
+ var variant = isWarningSaveError(error) ? 'warning' : 'danger';
showToast(error && error.message ? error.message : (settings.errorMessage || 'Unable to save changes.'), variant);
} else {
window.alert(error && error.message ? error.message : (settings.errorMessage || 'Unable to save changes.'));
@@ -822,7 +939,7 @@
return;
}
- element.textContent = formatDashboardDate(date);
+ element.textContent = formatDashboardDate(date, element.getAttribute('data-local-datetime-format') === '24h');
});
}
@@ -862,6 +979,8 @@
initConfirmForms();
initDeleteButtons();
initDirtyTracking();
+ initLimitedInputValues();
+ initLimitedTextInputValues();
initCancelConfirm();
initAsyncCommandForms();
initAsyncSaveForms();
@@ -872,6 +991,10 @@
attachSlideThumbFallbacks(document);
window.initJsonTogglePanels = initJsonTogglePanels;
window.initLocalDateTimes = initLocalDateTimes;
+ window.clampLimitedInputValue = clampLimitedInputValue;
+ window.initLimitedInputValues = initLimitedInputValues;
+ window.clampLimitedTextValue = clampLimitedTextValue;
+ window.initLimitedTextInputValues = initLimitedTextInputValues;
window.createSlideThumbPlaceholder = createSlideThumbPlaceholder;
window.attachSlideThumbFallbacks = attachSlideThumbFallbacks;
}());
diff --git a/src/web/public/js/announcements/announcement-form.js b/src/web/public/js/announcements/announcement-form.js
index 4cf6444..df98f1b 100644
--- a/src/web/public/js/announcements/announcement-form.js
+++ b/src/web/public/js/announcements/announcement-form.js
@@ -18,21 +18,127 @@ function updateAnnouncementDurationFields() {
}
}
-function updateAnnouncementColorPreview() {
- var colorSelect = document.getElementById('announcement-color');
- var preview = document.querySelector('[data-announcement-color-preview]');
- if (!colorSelect || !preview) {
+function updateAnnouncementColorPickerSelection() {
+ var colorInput = document.getElementById('announcement-color');
+ var picker = document.querySelector('[data-announcement-color-picker-shell]');
+ if (!colorInput || !picker) {
return;
}
- var selectedOption = colorSelect.options[colorSelect.selectedIndex] || null;
- var colorKey = String(colorSelect.value || '').trim().toLowerCase() || 'primary';
- var label = selectedOption ? String(selectedOption.textContent || selectedOption.label || colorKey).trim() : colorKey;
+ var selectedValue = String(colorInput.value || '').trim().toLowerCase() || 'primary';
+ picker.querySelectorAll('[data-announcement-color-option]').forEach(function (button) {
+ var isSelected = String(button.getAttribute('data-color-key') || '').trim().toLowerCase() === selectedValue;
+ button.classList.toggle('is-selected', isSelected);
+ button.setAttribute('aria-pressed', isSelected ? 'true' : 'false');
+ });
+}
- preview.className = 'announcement-color-preview text-bg-' + colorKey;
- preview.setAttribute('aria-label', label);
- preview.setAttribute('title', label);
- preview.textContent = '';
+function setAnnouncementScreenSelection(isSelected) {
+ document.querySelectorAll('input[name="screen_ids[]"]').forEach(function (input) {
+ input.checked = isSelected;
+ });
+}
+
+function positionAnnouncementTypePicker() {
+ var picker = document.querySelector('[data-announcement-type-picker]');
+ var toggle = document.querySelector('[data-announcement-type-picker-toggle]');
+ var shell = document.querySelector('[data-announcement-type-picker-shell]');
+ if (!picker || picker.hidden || !toggle || !shell) {
+ return;
+ }
+
+ var padding = 8;
+ var toggleRect = toggle.getBoundingClientRect();
+ var menuRect = picker.getBoundingClientRect();
+ var viewportHeight = window.innerHeight || document.documentElement.clientHeight || toggleRect.bottom;
+ var placementAbove = false;
+ var spaceBelow = viewportHeight - toggleRect.bottom - padding;
+ var spaceAbove = toggleRect.top - padding;
+
+ if (menuRect.height > spaceBelow && spaceAbove > spaceBelow) {
+ placementAbove = true;
+ }
+
+ picker.classList.toggle('is-open-above', placementAbove);
+}
+
+function closeAnnouncementTypePicker() {
+ var picker = document.querySelector('[data-announcement-type-picker]');
+ var toggle = document.querySelector('[data-announcement-type-picker-toggle]');
+ if (!picker) {
+ return;
+ }
+
+ picker.hidden = true;
+ picker.classList.remove('is-open-above');
+ if (toggle) {
+ toggle.setAttribute('aria-expanded', 'false');
+ }
+}
+
+function openAnnouncementTypePicker() {
+ var picker = document.querySelector('[data-announcement-type-picker]');
+ var toggle = document.querySelector('[data-announcement-type-picker-toggle]');
+ if (!picker) {
+ return;
+ }
+
+ picker.hidden = false;
+ if (toggle) {
+ toggle.setAttribute('aria-expanded', 'true');
+ }
+
+ if (typeof window !== 'undefined' && window.requestAnimationFrame) {
+ window.requestAnimationFrame(positionAnnouncementTypePicker);
+ } else {
+ positionAnnouncementTypePicker();
+ }
+}
+
+function updateAnnouncementTypePickerSelection() {
+ var typeInput = document.getElementById('announcement-type');
+ var previewButton = document.querySelector('[data-announcement-type-picker-toggle]');
+ var picker = document.querySelector('[data-announcement-type-picker]');
+ if (!typeInput || !previewButton || !picker) {
+ return;
+ }
+
+ var selectedValue = String(typeInput.value || '').trim().toLowerCase();
+ var selectedOption = picker.querySelector('[data-announcement-type-option][data-type-key="' + selectedValue + '"]');
+ var label = selectedOption ? String(selectedOption.getAttribute('data-type-label') || selectedOption.textContent || selectedValue).trim() : selectedValue;
+ var iconKey = selectedOption ? String(selectedOption.getAttribute('data-type-icon') || '').trim().toLowerCase() : '';
+ var icon = previewButton.querySelector('[data-announcement-type-picker-icon]');
+ var text = previewButton.querySelector('[data-announcement-type-picker-label]');
+
+ previewButton.setAttribute('aria-label', label);
+ previewButton.setAttribute('title', label);
+ if (icon) {
+ icon.className = 'bi bi-' + iconKey;
+ }
+ if (text) {
+ text.textContent = label;
+ }
+
+ picker.querySelectorAll('[data-announcement-type-option]').forEach(function (button) {
+ var isSelected = String(button.getAttribute('data-type-key') || '').trim().toLowerCase() === selectedValue;
+ button.classList.toggle('is-selected', isSelected);
+ button.setAttribute('aria-pressed', isSelected ? 'true' : 'false');
+ });
+}
+
+function setAnnouncementTypeValue(typeKey) {
+ var typeInput = document.getElementById('announcement-type');
+ if (!typeInput) {
+ return;
+ }
+
+ var normalized = String(typeKey || '').trim().toLowerCase();
+ if (!normalized) {
+ return;
+ }
+
+ typeInput.value = normalized;
+ updateAnnouncementTypePickerSelection();
}
function updateAnnouncementIconPreview() {
@@ -155,21 +261,90 @@ function setAnnouncementIconValue(iconKey) {
}
function initAnnouncementForm() {
+ var typeInput = document.getElementById('announcement-type');
+ var typePickerToggle = document.querySelector('[data-announcement-type-picker-toggle]');
+ var typePicker = document.querySelector('[data-announcement-type-picker]');
+ var typePickerClose = document.querySelector('[data-announcement-type-picker-close]');
var modeSelect = document.getElementById('announcement-duration-mode');
- var colorSelect = document.getElementById('announcement-color');
+ var colorInput = document.getElementById('announcement-color');
+ var colorPicker = document.querySelector('[data-announcement-color-picker-shell]');
+ var screenSelectAll = document.querySelector('[data-announcement-screen-select-all]');
+ var screenSelectNone = document.querySelector('[data-announcement-screen-select-none]');
var iconSelect = document.getElementById('announcement-icon');
var iconPickerToggle = document.querySelector('[data-announcement-icon-picker-toggle]');
var iconPicker = document.querySelector('[data-announcement-icon-picker]');
var iconPickerClose = document.querySelector('[data-announcement-icon-picker-close]');
+ if (typeInput) {
+ updateAnnouncementTypePickerSelection();
+ }
+
+ if (typePickerToggle) {
+ typePickerToggle.addEventListener('click', function (event) {
+ event.preventDefault();
+ var isExpanded = typePicker && !typePicker.hidden;
+ if (isExpanded) {
+ closeAnnouncementTypePicker();
+ } else {
+ openAnnouncementTypePicker();
+ }
+ });
+ }
+
+ if (typePickerClose) {
+ typePickerClose.addEventListener('click', function (event) {
+ event.preventDefault();
+ closeAnnouncementTypePicker();
+ });
+ }
+
+ if (typePicker) {
+ typePicker.addEventListener('click', function (event) {
+ var button = event.target && event.target.closest ? event.target.closest('[data-announcement-type-option]') : null;
+ if (!button) {
+ return;
+ }
+
+ event.preventDefault();
+ setAnnouncementTypeValue(button.getAttribute('data-type-key'));
+ closeAnnouncementTypePicker();
+ });
+ }
+
if (modeSelect) {
modeSelect.addEventListener('change', updateAnnouncementDurationFields);
updateAnnouncementDurationFields();
}
- if (colorSelect) {
- colorSelect.addEventListener('change', updateAnnouncementColorPreview);
- updateAnnouncementColorPreview();
+ if (colorInput) {
+ updateAnnouncementColorPickerSelection();
+ }
+
+ if (colorPicker) {
+ colorPicker.addEventListener('click', function (event) {
+ var button = event.target && event.target.closest ? event.target.closest('[data-announcement-color-option]') : null;
+ if (!button) {
+ return;
+ }
+
+ event.preventDefault();
+ colorInput.value = String(button.getAttribute('data-color-key') || '').trim().toLowerCase();
+ updateAnnouncementColorPickerSelection();
+ });
+ }
+
+ if (screenSelectAll) {
+ screenSelectAll.addEventListener('click', function (event) {
+ event.preventDefault();
+ setAnnouncementScreenSelection(true);
+ });
+ }
+
+ if (screenSelectNone) {
+ screenSelectNone.addEventListener('click', function (event) {
+ event.preventDefault();
+ setAnnouncementScreenSelection(false);
+ });
}
if (iconSelect) {
@@ -210,8 +385,17 @@ function initAnnouncementForm() {
}
window.addEventListener('resize', positionAnnouncementIconPicker);
+ window.addEventListener('resize', positionAnnouncementTypePicker);
document.addEventListener('click', function (event) {
+ var typePickerNode = document.querySelector('[data-announcement-type-picker]');
+ var typeToggleNode = document.querySelector('[data-announcement-type-picker-toggle]');
+ if (typePickerNode && !typePickerNode.hidden) {
+ if (!(typePickerNode.contains(event.target) || (typeToggleNode && typeToggleNode.contains(event.target)))) {
+ closeAnnouncementTypePicker();
+ }
+ }
+
var picker = document.querySelector('[data-announcement-icon-picker]');
var toggle = document.querySelector('[data-announcement-icon-picker-toggle]');
if (!picker || picker.hidden) {
diff --git a/src/web/public/js/data-sources/timetable-group-form.js b/src/web/public/js/data-sources/timetable-group-form.js
index c282e2b..0a0322d 100644
--- a/src/web/public/js/data-sources/timetable-group-form.js
+++ b/src/web/public/js/data-sources/timetable-group-form.js
@@ -10,6 +10,10 @@
return;
}
+ function markDirty() {
+ form.dataset.dirty = 'true';
+ }
+
function pad(value) {
return String(value).padStart(2, '0');
}
@@ -95,6 +99,7 @@
}
button.addEventListener('click', function () {
row.remove();
+ markDirty();
});
}
@@ -106,6 +111,7 @@
}
bindRemove(row);
body.appendChild(fragment);
+ markDirty();
}
body.querySelectorAll('[data-timetable-entry-row]').forEach(function (row) {
diff --git a/src/web/public/js/playlists/playlist-schedule.js b/src/web/public/js/playlists/playlist-schedule.js
index 1cd2e00..303034f 100644
--- a/src/web/public/js/playlists/playlist-schedule.js
+++ b/src/web/public/js/playlists/playlist-schedule.js
@@ -197,6 +197,341 @@
}).join('');
}
+ function parseLocalDate(value) {
+ var date = new Date(String(value || '').trim());
+
+ if (Number.isNaN(date.getTime())) {
+ return null;
+ }
+
+ return new Date(date.getFullYear(), date.getMonth(), date.getDate());
+ }
+
+ function isDayInDateRange(startDatetime, endDatetime, dayIndex) {
+ var startDate = parseLocalDate(startDatetime);
+ var endDate = parseLocalDate(endDatetime);
+ var currentDate;
+
+ if (!startDate || !endDate) {
+ return false;
+ }
+
+ for (currentDate = new Date(startDate.getTime()); currentDate.getTime() <= endDate.getTime(); currentDate.setDate(currentDate.getDate() + 1)) {
+ if (currentDate.getDay() === Number(dayIndex)) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ function getTimeParts(value) {
+ var match = String(value || '').trim().match(/^(\d{2}):(\d{2})(?::\d{2})?$/);
+
+ if (!match) {
+ return null;
+ }
+
+ return {
+ hours: Number(match[1]),
+ minutes: Number(match[2])
+ };
+ }
+
+ function combineDateAndTime(baseDate, timeValue) {
+ var timeParts = getTimeParts(timeValue);
+
+ if (!baseDate || !timeParts) {
+ return null;
+ }
+
+ return new Date(
+ baseDate.getFullYear(),
+ baseDate.getMonth(),
+ baseDate.getDate(),
+ timeParts.hours,
+ timeParts.minutes,
+ 0,
+ 0
+ );
+ }
+
+ function hasScheduleRuleOverlap(startDatetime, endDatetime, startTime, endTime, selectedDays) {
+ var startDateTime = new Date(String(startDatetime || '').trim());
+ var endDateTime = new Date(String(endDatetime || '').trim());
+ var startDate = parseLocalDate(startDatetime);
+ var endDate = parseLocalDate(endDatetime);
+ var allowedDays = Array.isArray(selectedDays) && selectedDays.length ? selectedDays : [0, 1, 2, 3, 4, 5, 6];
+ var currentDate;
+
+ if (!startDate || !endDate || Number.isNaN(startDateTime.getTime()) || Number.isNaN(endDateTime.getTime())) {
+ return false;
+ }
+
+ for (currentDate = new Date(startDate.getTime()); currentDate.getTime() <= endDate.getTime(); currentDate.setDate(currentDate.getDate() + 1)) {
+ if (allowedDays.indexOf(currentDate.getDay()) === -1) {
+ continue;
+ }
+
+ var dayStart = combineDateAndTime(currentDate, startTime);
+ var dayEnd = combineDateAndTime(currentDate, endTime);
+
+ if (!dayStart || !dayEnd) {
+ continue;
+ }
+
+ if (dayEnd >= startDateTime && dayStart <= endDateTime) {
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ function getDateRangeDayIndices(startDatetime, endDatetime) {
+ var startDate = parseLocalDate(startDatetime);
+ var endDate = parseLocalDate(endDatetime);
+ var dayIndices = [];
+ var currentDate;
+
+ if (!startDate || !endDate) {
+ return dayIndices;
+ }
+
+ for (currentDate = new Date(startDate.getTime()); currentDate.getTime() <= endDate.getTime(); currentDate.setDate(currentDate.getDate() + 1)) {
+ if (dayIndices.indexOf(currentDate.getDay()) === -1) {
+ dayIndices.push(currentDate.getDay());
+ }
+ }
+
+ return dayIndices;
+ }
+
+ function setDayInputError(card, dayInput, message) {
+ var dayInputs = card ? Array.prototype.slice.call(card.querySelectorAll('[data-schedule-rule-day]')) : [];
+ var dayLabels = card ? Array.prototype.slice.call(card.querySelectorAll('.schedule-day-button')) : [];
+ var feedbackNode = card ? card.querySelector('[data-schedule-rule-feedback]') : null;
+ var dayIndex = dayInputs.indexOf(dayInput);
+
+ if (dayInput) {
+ dayInput.setCustomValidity(message);
+ dayInput.classList.add('is-invalid');
+ dayInput.setAttribute('aria-invalid', 'true');
+ }
+
+ if (dayIndex !== -1 && dayLabels[dayIndex]) {
+ dayLabels[dayIndex].classList.add('is-invalid');
+ dayLabels[dayIndex].setAttribute('aria-invalid', 'true');
+ }
+
+ if (feedbackNode) {
+ var messageNode = document.createElement('div');
+ messageNode.textContent = message;
+ feedbackNode.appendChild(messageNode);
+ feedbackNode.hidden = false;
+ }
+ }
+
+ function appendRuleFeedbackMessage(card, message) {
+ var feedbackNode = card ? card.querySelector('[data-schedule-rule-feedback]') : null;
+
+ if (!feedbackNode) {
+ return;
+ }
+
+ var messageNode = document.createElement('div');
+ messageNode.textContent = message;
+ feedbackNode.appendChild(messageNode);
+ feedbackNode.hidden = false;
+ }
+
+ function validateScheduleRuleCard(card) {
+ var fields = getRuleFields(card);
+ var dayInputs = Array.prototype.slice.call(fields.days || []);
+ var dayLabels = getRuleDayLabels(card);
+ var checkedDayInputs = dayInputs.filter(function (input) {
+ return Boolean(input && input.checked);
+ });
+ var checkedDayIndices = checkedDayInputs.map(function (input) {
+ return Number(input && input.value);
+ });
+ var startDatetime = String(fields.startDatetime && fields.startDatetime.value || '').trim();
+ var endDatetime = String(fields.endDatetime && fields.endDatetime.value || '').trim();
+ var startTime = String(fields.startTime && fields.startTime.value || '').trim();
+ var endTime = String(fields.endTime && fields.endTime.value || '').trim();
+ clearRuleValidity(card);
+
+ if ((startDatetime || endDatetime) && (!startDatetime || !endDatetime)) {
+ setRuleError(!startDatetime ? fields.startDatetime : fields.endDatetime, 'Start and end datetimes must both be set for this rule.');
+ return false;
+ }
+
+ if ((startTime || endTime) && (!startTime || !endTime)) {
+ setRuleError(!startTime ? fields.startTime : fields.endTime, 'Start and end times must both be set for this rule.');
+ return false;
+ }
+
+ if (startDatetime && endDatetime && new Date(endDatetime) <= new Date(startDatetime)) {
+ setRuleError(fields.endDatetime, 'End datetime must be after start datetime.');
+ return false;
+ }
+
+ if (startTime && endTime && endTime <= startTime) {
+ setRuleError(fields.endTime, 'End time must be after start time.');
+ if (fields.startTime) {
+ fields.startTime.classList.add('is-invalid');
+ fields.startTime.setAttribute('aria-invalid', 'true');
+ }
+ return false;
+ }
+
+ if (startDatetime && endDatetime) {
+ var dateRangeDayIndices = getDateRangeDayIndices(startDatetime, endDatetime);
+ var dayIndicesToCheck = checkedDayIndices.length ? checkedDayIndices : [0, 1, 2, 3, 4, 5, 6];
+ var invalidDayInputs = checkedDayInputs.filter(function (input) {
+ return dateRangeDayIndices.indexOf(Number(input && input.value)) === -1;
+ });
+
+ invalidDayInputs.forEach(function (input) {
+ var dayIndex = dayInputs.indexOf(input);
+
+ if (dayIndex !== -1 && dayLabels[dayIndex]) {
+ dayLabels[dayIndex].classList.add('is-invalid');
+ dayLabels[dayIndex].setAttribute('aria-invalid', 'true');
+ }
+ });
+
+ if (checkedDayInputs.length && invalidDayInputs.length === checkedDayInputs.length) {
+ setDayInputError(card, invalidDayInputs[0] || checkedDayInputs[0] || dayInputs[0], 'Selected days must overlap the date range.');
+ return false;
+ }
+
+ if (startTime && endTime && !hasScheduleRuleOverlap(startDatetime, endDatetime, startTime, endTime, dayIndicesToCheck)) {
+ setRuleError(fields.endTime, 'Start and end times must overlap the date range.');
+ if (fields.startTime) {
+ fields.startTime.classList.add('is-invalid');
+ fields.startTime.setAttribute('aria-invalid', 'true');
+ }
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ function getScheduleRuleValidationIssue(card) {
+ var fields = getRuleFields(card);
+ var dayInputs = Array.prototype.slice.call(fields.days || []);
+ var checkedDayInputs = dayInputs.filter(function (input) {
+ return Boolean(input && input.checked);
+ });
+ var checkedDayIndices = checkedDayInputs.map(function (input) {
+ return Number(input && input.value);
+ });
+ var startDatetime = String(fields.startDatetime && fields.startDatetime.value || '').trim();
+ var endDatetime = String(fields.endDatetime && fields.endDatetime.value || '').trim();
+ var startTime = String(fields.startTime && fields.startTime.value || '').trim();
+ var endTime = String(fields.endTime && fields.endTime.value || '').trim();
+
+ if (startDatetime || endDatetime) {
+ if (!startDatetime || !endDatetime) {
+ return {
+ type: 'datetime-pair',
+ target: !startDatetime ? fields.startDatetime : fields.endDatetime,
+ message: 'Start and end datetimes must both be set for this rule.'
+ };
+ }
+ }
+
+ if (startTime || endTime) {
+ if (!startTime || !endTime) {
+ return {
+ type: 'time-pair',
+ target: !startTime ? fields.startTime : fields.endTime,
+ message: 'Start and end times must both be set for this rule.'
+ };
+ }
+ }
+
+ if (startDatetime && endDatetime && new Date(endDatetime) <= new Date(startDatetime)) {
+ return {
+ type: 'datetime-order',
+ target: fields.endDatetime,
+ message: 'End datetime must be after start datetime.'
+ };
+ }
+
+ if (startTime && endTime && endTime <= startTime) {
+ return {
+ type: 'time-order',
+ target: fields.endTime,
+ message: 'End time must be after start time.'
+ };
+ }
+
+ if (startDatetime && endDatetime) {
+ var dateRangeDayIndices = getDateRangeDayIndices(startDatetime, endDatetime);
+ var dayIndicesToCheck = checkedDayIndices.length ? checkedDayIndices : [0, 1, 2, 3, 4, 5, 6];
+ var invalidDayInputs = checkedDayInputs.filter(function (input) {
+ return dateRangeDayIndices.indexOf(Number(input && input.value)) === -1;
+ });
+
+ if (checkedDayInputs.length && invalidDayInputs.length === checkedDayInputs.length) {
+ return {
+ type: 'day-overlap',
+ target: checkedDayInputs[0] || dayInputs[0] || fields.endDatetime,
+ message: 'Selected days must overlap the date range.'
+ };
+ }
+
+ if (startTime && endTime && !hasScheduleRuleOverlap(startDatetime, endDatetime, startTime, endTime, dayIndicesToCheck)) {
+ return {
+ type: 'time-overlap',
+ target: fields.endTime,
+ secondaryTarget: fields.startTime,
+ message: 'Start and end times must overlap the date range.'
+ };
+ }
+ }
+
+ return null;
+ }
+
+ function applyScheduleRuleValidationIssue(card, issue) {
+ var fields = getRuleFields(card);
+ var dayLabels = getRuleDayLabels(card);
+
+ clearRuleValidity(card);
+
+ if (!issue) {
+ return true;
+ }
+
+ if (issue.type === 'time-overlap') {
+ setRuleError(issue.target || fields.endTime, issue.message);
+ if (issue.secondaryTarget) {
+ issue.secondaryTarget.classList.add('is-invalid');
+ issue.secondaryTarget.setAttribute('aria-invalid', 'true');
+ }
+ return false;
+ }
+
+ if (issue.type === 'day-overlap') {
+ var dayInputs = Array.prototype.slice.call(fields.days || []);
+ var dayIndex = dayInputs.indexOf(issue.target);
+
+ setRuleError(issue.target, issue.message);
+ if (dayIndex !== -1 && dayLabels[dayIndex]) {
+ dayLabels[dayIndex].classList.add('is-invalid');
+ dayLabels[dayIndex].setAttribute('aria-invalid', 'true');
+ }
+ return false;
+ }
+
+ setRuleError(issue.target, issue.message);
+ return false;
+ }
+
// Video duration helpers.
function getVideoDurationButtonLabel(isPressed) {
return isPressed ? 'Disable use video duration' : 'Use video duration';
@@ -213,7 +548,7 @@
return '';
}
- return '';
+ return '';
}
function getDisableAudioButtonLabel(isPressed) {
@@ -241,7 +576,6 @@
button.classList.toggle('btn-outline-secondary', Boolean(isPressed));
button.classList.toggle('btn-secondary', !Boolean(isPressed));
- button.classList.toggle('active', !Boolean(isPressed));
button.setAttribute('aria-pressed', isPressed ? 'true' : 'false');
button.setAttribute('aria-label', getDisableAudioButtonLabel(isPressed));
button.setAttribute('title', getDisableAudioButtonLabel(isPressed));
@@ -253,7 +587,8 @@
return;
}
- button.classList.toggle('active', Boolean(isPressed));
+ button.classList.toggle('btn-outline-info', !Boolean(isPressed));
+ button.classList.toggle('btn-info', Boolean(isPressed));
button.setAttribute('aria-pressed', isPressed ? 'true' : 'false');
button.setAttribute('aria-label', getVideoDurationButtonLabel(isPressed));
button.setAttribute('title', getVideoDurationButtonLabel(isPressed));
@@ -382,7 +717,11 @@
return '' +
'' +
'' +
- ' ' +
+ ' ' +
+ '' +
+ '' +
+ '' +
+ ' ' +
' ' +
' ' +
' | ';
@@ -412,8 +751,11 @@
function buildPlaylistDurationCellMarkup(values, durationActionMarkup) {
return '' +
- '' +
- ' ' +
+ ' ' +
+ ' ' +
+ '' +
+ '' +
+ ' ' +
' ' +
' ' +
(values.useVideoDuration ? ' ' : '') +
@@ -586,8 +928,7 @@
' ' +
'' +
'' +
' ' +
@@ -614,11 +955,14 @@
' ' +
'' +
'' +
+ '' +
'' +
'';
}
@@ -779,13 +1123,71 @@
return card ? card.querySelector('[data-remove-schedule-rule]') : null;
}
+ function getRuleDayLabels(card) {
+ return card ? Array.prototype.slice.call(card.querySelectorAll('.schedule-day-button')) : [];
+ }
+
+ function getCollapseRuleButton(card) {
+ return card ? card.querySelector('[data-schedule-rule-collapse], [data-lte-toggle="card-collapse"]') : null;
+ }
+
+ function getCollapseRuleIcon(card) {
+ return card ? card.querySelector('[data-schedule-rule-collapse-icon]') : null;
+ }
+
+ function syncRuleCollapseButtonState(card) {
+ var button = getCollapseRuleButton(card);
+ var icon = getCollapseRuleIcon(card);
+ var numberNode = getRuleNumberNode(card);
+ var ruleIndex = numberNode ? String(numberNode.textContent || '') : '';
+ var isCollapsed = Boolean(card && card.classList && card.classList.contains('collapsed-card'));
+ var label = (isCollapsed ? 'Expand' : 'Collapse') + ' rule ' + ruleIndex;
+
+ if (!button) {
+ return;
+ }
+
+ button.setAttribute('aria-expanded', isCollapsed ? 'false' : 'true');
+ button.setAttribute('aria-label', label);
+ button.setAttribute('title', label);
+
+ if (icon) {
+ icon.classList.remove('bi-dash-lg', 'bi-plus-lg');
+ icon.classList.add(isCollapsed ? 'bi-plus-lg' : 'bi-dash-lg');
+ }
+
+ var visibleLabel = button.querySelector('.visually-hidden');
+ if (visibleLabel) {
+ visibleLabel.textContent = label;
+ }
+ }
+
function clearRuleValidity(card) {
var fields = getRuleFields(card);
+ var dayInputs = Array.prototype.slice.call(fields.days || []);
+ var dayLabels = getRuleDayLabels(card);
+ var feedbackNode = card ? card.querySelector('[data-schedule-rule-feedback]') : null;
[fields.startDatetime, fields.endDatetime, fields.startTime, fields.endTime].forEach(function (input) {
if (input) {
input.setCustomValidity('');
+ input.classList.remove('is-invalid');
+ input.removeAttribute('aria-invalid');
}
});
+ dayInputs.forEach(function (input) {
+ input.setCustomValidity('');
+ input.classList.remove('is-invalid');
+ input.removeAttribute('aria-invalid');
+ });
+ dayLabels.forEach(function (label) {
+ label.classList.remove('is-invalid');
+ label.removeAttribute('aria-invalid');
+ });
+
+ if (feedbackNode) {
+ feedbackNode.innerHTML = '';
+ feedbackNode.hidden = true;
+ }
}
function setRuleError(input, message) {
@@ -793,37 +1195,96 @@
return;
}
input.setCustomValidity(message);
+ if (String(input.value || '').trim()) {
+ input.classList.add('is-invalid');
+ input.setAttribute('aria-invalid', 'true');
+ }
+
+ appendRuleFeedbackMessage(input.closest ? input.closest('[data-schedule-rule-card]') : null, message);
}
- function validateRuleCard(card) {
+ function validateScheduleRuleCard(card) {
var fields = getRuleFields(card);
+ var dayInputs = Array.prototype.slice.call(fields.days || []);
+ var dayLabels = getRuleDayLabels(card);
+ var checkedDayInputs = dayInputs.filter(function (input) {
+ return Boolean(input && input.checked);
+ });
+ var checkedDayIndices = checkedDayInputs.map(function (input) {
+ return Number(input && input.value);
+ });
var startDatetime = String(fields.startDatetime && fields.startDatetime.value || '').trim();
var endDatetime = String(fields.endDatetime && fields.endDatetime.value || '').trim();
var startTime = String(fields.startTime && fields.startTime.value || '').trim();
var endTime = String(fields.endTime && fields.endTime.value || '').trim();
- var hasDateInput = Boolean(startDatetime || endDatetime);
- var hasTimeInput = Boolean(startTime || endTime);
+ var isValid = true;
clearRuleValidity(card);
- if (hasDateInput && (!startDatetime || !endDatetime)) {
- setRuleError(fields.startDatetime || fields.endDatetime, 'Start and end datetimes must both be set for this rule.');
- return false;
- }
- if (hasTimeInput && (!startTime || !endTime)) {
- setRuleError(fields.startTime || fields.endTime, 'Start and end times must both be set for this rule.');
- return false;
- }
- if (startDatetime && endDatetime && new Date(endDatetime) < new Date(startDatetime)) {
- setRuleError(fields.endDatetime, 'End datetime must be after start datetime.');
- return false;
- }
- if (startTime && endTime && endTime < startTime) {
- setRuleError(fields.endTime, 'End time must be after start time.');
- return false;
+ if ((startDatetime || endDatetime) && (!startDatetime || !endDatetime)) {
+ setRuleError(!startDatetime ? fields.startDatetime : fields.endDatetime, 'Start and end datetimes must both be set for this rule.');
+ isValid = false;
}
- return true;
+ if ((startTime || endTime) && (!startTime || !endTime)) {
+ setRuleError(!startTime ? fields.startTime : fields.endTime, 'Start and end times must both be set for this rule.');
+ isValid = false;
+ }
+
+ if (startDatetime && endDatetime && new Date(endDatetime) <= new Date(startDatetime)) {
+ setRuleError(fields.endDatetime, 'End datetime must be after start datetime.');
+ isValid = false;
+ }
+
+ if (startTime && endTime && endTime <= startTime) {
+ setRuleError(fields.endTime, 'End time must be after start time.');
+ if (fields.startTime) {
+ fields.startTime.classList.add('is-invalid');
+ fields.startTime.setAttribute('aria-invalid', 'true');
+ }
+ isValid = false;
+ }
+
+ if (startDatetime && endDatetime) {
+ var dateRangeDayIndices = getDateRangeDayIndices(startDatetime, endDatetime);
+ var dayIndicesToCheck = checkedDayIndices.length ? checkedDayIndices : [0, 1, 2, 3, 4, 5, 6];
+ var invalidDayInputs = checkedDayInputs.filter(function (input) {
+ return dateRangeDayIndices.indexOf(Number(input && input.value)) === -1;
+ });
+
+ invalidDayInputs.forEach(function (input) {
+ var dayIndex = dayInputs.indexOf(input);
+
+ if (dayIndex !== -1 && dayLabels[dayIndex]) {
+ dayLabels[dayIndex].classList.add('is-invalid');
+ dayLabels[dayIndex].setAttribute('aria-invalid', 'true');
+ }
+ });
+
+ if (checkedDayInputs.length && invalidDayInputs.length === checkedDayInputs.length) {
+ setDayInputError(card, checkedDayInputs[0] || dayInputs[0], 'Selected days must overlap the date range.');
+ isValid = false;
+ }
+
+ if (startTime && endTime && !hasScheduleRuleOverlap(startDatetime, endDatetime, startTime, endTime, dayIndicesToCheck)) {
+ setRuleError(fields.endTime, 'Start and end times must overlap the date range.');
+ if (fields.startTime) {
+ fields.startTime.classList.add('is-invalid');
+ fields.startTime.setAttribute('aria-invalid', 'true');
+ }
+ isValid = false;
+ }
+ }
+
+ return isValid;
+ }
+
+ function updateLiveRuleValidity(card) {
+ validateScheduleRuleCard(card);
+ }
+
+ function validateRuleCard(card) {
+ return validateScheduleRuleCard(card);
}
function readRuleFromCard(card) {
@@ -978,37 +1439,47 @@
card.querySelector('[data-schedule-rule-start-time]').value = String(normalizedRule.start_time || '');
card.querySelector('[data-schedule-rule-end-time]').value = String(normalizedRule.end_time || '');
card.querySelector('[data-remove-schedule-rule]').setAttribute('data-confirm-message', 'Remove this rule?');
- card.querySelector('[data-lte-toggle="card-collapse"]').setAttribute('aria-label', 'Collapse rule ' + String(ruleIndex));
- card.querySelector('[data-lte-toggle="card-collapse"]').setAttribute('title', 'Collapse rule ' + String(ruleIndex));
- card.querySelector('[data-lte-toggle="card-collapse"] .visually-hidden').textContent = 'Collapse rule ' + String(ruleIndex);
updateRuleCardDayOptions(card, ruleKey, normalizedRule);
- card.querySelector('[data-lte-toggle="card-collapse"]').addEventListener('click', function (event) {
- event.preventDefault();
- card.classList.toggle('collapsed-card');
- persistScheduleDraft();
- });
-
if (isCollapsed) {
card.classList.add('collapsed-card');
} else {
card.classList.remove('collapsed-card');
}
+ try {
+ updateLiveRuleValidity(card);
+ } catch (_error) {
+ clearRuleValidity(card);
+ }
+ syncRuleCollapseButtonState(card);
+
return card;
}
function addRule(rule, options) {
var ruleCount = getRuleCards().length + 1;
var card = createRuleCardElement(rule || {}, ruleCount, options);
- scheduleRuleList.appendChild(card);
+
+ if (!card) {
+ scheduleRuleList.insertAdjacentHTML('beforeend', buildScheduleRuleCardMarkup(rule || {}, ruleCount, Boolean(options && options.isCollapsed)));
+ card = scheduleRuleList.lastElementChild;
+ }
+
+ if (!card) {
+ return null;
+ }
+
+ if (card.parentNode !== scheduleRuleList) {
+ scheduleRuleList.appendChild(card);
+ }
refreshRuleNumbers();
syncScheduleRulesField();
return card;
}
function handleCardChange(card) {
- clearRuleValidity(card);
+ updateLiveRuleValidity(card);
updateRuleCardSummary(card);
syncScheduleRulesField();
}
@@ -1074,6 +1545,16 @@
scheduleRuleList.addEventListener('click', function (event) {
var removeButton = event.target && event.target.closest ? event.target.closest('[data-remove-schedule-rule]') : null;
+ var collapseButton = event.target && event.target.closest ? event.target.closest('[data-schedule-rule-collapse], [data-lte-toggle="card-collapse"]') : null;
+
+ if (collapseButton) {
+ window.setTimeout(function () {
+ syncRuleCollapseButtonState(collapseButton.closest('[data-schedule-rule-card]'));
+ persistScheduleDraft();
+ }, 0);
+ return;
+ }
+
if (!removeButton) {
return;
}
@@ -1107,6 +1588,8 @@
} else {
refreshRuleNumbers();
getRuleCards().forEach(function (card) {
+ syncRuleCollapseButtonState(card);
+ updateLiveRuleValidity(card);
updateRuleCardSummary(card);
});
syncScheduleRulesField();
@@ -1637,9 +2120,36 @@
var rows = getRows();
rows.forEach(function (row, index) {
var orderNumber = row.querySelector('.playlist-order-number');
+ var moveUpButton = row.querySelector('[data-playlist-row-move="up"]');
+ var moveDownButton = row.querySelector('[data-playlist-row-move="down"]');
+ var moveUpIcon = row.querySelector('[data-playlist-row-move-icon="up"]');
+ var moveDownIcon = row.querySelector('[data-playlist-row-move-icon="down"]');
+ var isFirst = index === 0;
+ var isLast = index === rows.length - 1;
+
if (orderNumber) {
orderNumber.textContent = String(index + 1);
}
+
+ if (moveUpButton) {
+ moveUpButton.disabled = isFirst;
+ moveUpButton.setAttribute('aria-disabled', isFirst ? 'true' : 'false');
+ }
+
+ if (moveUpIcon) {
+ moveUpIcon.classList.toggle('bi-caret-up-fill', !isFirst);
+ moveUpIcon.classList.toggle('bi-caret-up', isFirst);
+ }
+
+ if (moveDownButton) {
+ moveDownButton.disabled = isLast;
+ moveDownButton.setAttribute('aria-disabled', isLast ? 'true' : 'false');
+ }
+
+ if (moveDownIcon) {
+ moveDownIcon.classList.toggle('bi-caret-down-fill', !isLast);
+ moveDownIcon.classList.toggle('bi-caret-down', isLast);
+ }
});
syncAddSlideOptions();
syncPlaylistCanvasLock();
@@ -1665,6 +2175,38 @@
});
}
+ function movePlaylistRowByOffset(row, offset) {
+ var currentTbody = document.getElementById('playlist-items-body') || tbody;
+ var rows = getRows();
+ var currentIndex = rows.indexOf(row);
+ var targetIndex;
+ var referenceRow;
+
+ if (!currentTbody || !row || currentIndex === -1) {
+ return false;
+ }
+
+ targetIndex = currentIndex + Number(offset || 0);
+ if (targetIndex < 0 || targetIndex >= rows.length) {
+ return false;
+ }
+
+ referenceRow = rows[targetIndex];
+
+ if (targetIndex > currentIndex) {
+ referenceRow = referenceRow ? referenceRow.nextSibling : null;
+ }
+
+ if (referenceRow) {
+ currentTbody.insertBefore(row, referenceRow);
+ } else {
+ currentTbody.appendChild(row);
+ }
+
+ updateRowOrder(true);
+ return true;
+ }
+
function populatePlaylistSlideRow(row, values, rowKey) {
var canvasWidth = Number(values.canvas_width);
var canvasHeight = Number(values.canvas_height);
@@ -1898,6 +2440,7 @@
return;
}
+ var moveButton = event.target.closest('[data-playlist-row-move]');
var removeButton = event.target.closest('[data-playlist-remove-row]');
var durationButton = event.target.closest('.playlist-use-video-duration');
var muteButton = event.target.closest('.playlist-disable-audio');
@@ -1907,6 +2450,13 @@
return;
}
+ if (moveButton) {
+ event.preventDefault();
+ event.stopPropagation();
+ movePlaylistRowByOffset(row, moveButton.getAttribute('data-playlist-row-move') === 'up' ? -1 : 1);
+ return;
+ }
+
if (removeButton) {
event.preventDefault();
row.remove();
diff --git a/src/web/public/js/rbac-permissions.js b/src/web/public/js/rbac-permissions.js
index 3f6319e..f950492 100644
--- a/src/web/public/js/rbac-permissions.js
+++ b/src/web/public/js/rbac-permissions.js
@@ -1,8 +1,16 @@
// RBAC permission matrix helpers for checkbox groups.
(function () {
- function getGroupCheckboxes(group) {
- return Array.prototype.slice.call(group.querySelectorAll('input[name="permission_keys[]"]'));
+ function getPermissionSections() {
+ return Array.prototype.slice.call(document.querySelectorAll('[data-permission-section]'));
+ }
+
+ function getPermissionRows(container) {
+ return Array.prototype.slice.call(container.querySelectorAll('[data-permission-row]'));
+ }
+
+ function getRowCheckboxes(row) {
+ return Array.prototype.slice.call(row.querySelectorAll('input[name="permission_keys[]"]'));
}
function getPermissionKey(checkbox) {
@@ -19,8 +27,12 @@
return String(parts[1] || '').trim().toLowerCase();
}
- function syncPermissionGroup(group) {
- var checkboxes = getGroupCheckboxes(group);
+ function syncPermissionRow(row) {
+ if (!row) {
+ return;
+ }
+
+ var checkboxes = getRowCheckboxes(row);
if (!checkboxes.length) {
return;
}
@@ -55,19 +67,57 @@
}
}
- function handleGroupChange(event) {
+ function setRowCheckboxes(row, checked) {
+ if (!row) {
+ return;
+ }
+
+ var checkboxes = getRowCheckboxes(row);
+ if (!checkboxes.length) {
+ return;
+ }
+
+ checkboxes.forEach(function (checkbox) {
+ checkbox.checked = Boolean(checked);
+ });
+
+ syncPermissionRow(row);
+ }
+
+ function toggleRowCheckboxes(row) {
+ if (!row) {
+ return;
+ }
+
+ var checkboxes = getRowCheckboxes(row);
+ if (!checkboxes.length) {
+ return;
+ }
+
+ var allChecked = checkboxes.every(function (checkbox) {
+ return Boolean(checkbox.checked);
+ });
+
+ setRowCheckboxes(row, !allChecked);
+ }
+
+ function findPermissionRow(targetId) {
+ return document.querySelector('[data-permission-row-id="' + targetId + '"]');
+ }
+
+ function handleRowChange(event) {
var checkbox = event.target && event.target.matches ? event.target : null;
if (!checkbox || checkbox.tagName !== 'INPUT' || checkbox.type !== 'checkbox') {
return;
}
var actionKey = getActionKey(checkbox);
- var group = checkbox.closest('.accordion-item');
- if (!group) {
+ var row = checkbox.closest('[data-permission-row]');
+ if (!row) {
return;
}
- var checkboxes = getGroupCheckboxes(group);
+ var checkboxes = getRowCheckboxes(row);
var readCheckbox = checkboxes.find(function (candidate) {
return getActionKey(candidate) === 'read';
}) || null;
@@ -91,8 +141,28 @@
}
function initPermissionGroups() {
- document.querySelectorAll('.accordion-item').forEach(function (group) {
- syncPermissionGroup(group);
+ getPermissionSections().forEach(function (section) {
+ getPermissionRows(section).forEach(function (row) {
+ syncPermissionRow(row);
+ });
+ });
+
+ document.addEventListener('click', function (event) {
+ var control = event.target && event.target.closest ? event.target.closest('[data-permission-row-toggle]') : null;
+ if (!control) {
+ return;
+ }
+
+ event.preventDefault();
+
+ var targetId = String(control.getAttribute('data-permission-row-target') || '').trim();
+ if (!targetId) {
+ return;
+ }
+
+ if (control.hasAttribute('data-permission-row-toggle')) {
+ toggleRowCheckboxes(findPermissionRow(targetId));
+ }
});
document.addEventListener('change', function (event) {
@@ -104,8 +174,8 @@
return;
}
- handleGroupChange(event);
- syncPermissionGroup(checkbox.closest('.accordion-item'));
+ handleRowChange(event);
+ syncPermissionRow(checkbox.closest('[data-permission-row]'));
});
}
diff --git a/src/web/public/js/regions/region-types.js b/src/web/public/js/regions/region-types.js
index c8fdf7d..4b2ef43 100644
--- a/src/web/public/js/regions/region-types.js
+++ b/src/web/public/js/regions/region-types.js
@@ -58,13 +58,26 @@
return registry[normalizeType(type)] || null;
}
+ function getRegionTypeLabel(type, definition) {
+ return String(definition && definition.label ? definition.label : type || '')
+ .trim()
+ .toLowerCase();
+ }
+
+ function compareRegionTypeEntries(left, right) {
+ var leftLabel = getRegionTypeLabel(left && left.type, left && left.definition);
+ var rightLabel = getRegionTypeLabel(right && right.type, right && right.definition);
+
+ return leftLabel.localeCompare(rightLabel, undefined, { sensitivity: 'base' }) || String(left && left.type || '').localeCompare(String(right && right.type || ''), undefined, { sensitivity: 'base' });
+ }
+
function list() {
return Object.keys(registry).map(function (type) {
return {
type: type,
definition: registry[type] || {}
};
- });
+ }).sort(compareRegionTypeEntries);
}
function getDefaultRegionSize(regionType, lockRatio) {
@@ -91,18 +104,38 @@
return String(definition.label);
}
- var normalized = normalizeType(regionType);
- if (!normalized) {
- return 'Region';
- }
+ return 'Text';
+ }
- return normalized
- .split(/[_-]+/)
- .filter(function (segment) { return segment; })
- .map(function (segment) {
- return segment.charAt(0).toUpperCase() + segment.slice(1);
- })
- .join(' ') || 'Region';
+ function escapeHtml(value) {
+ return String(value === undefined || value === null ? '' : value)
+ .replace(/&/g, '&')
+ .replace(//g, '>')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''');
+ }
+
+ function renderEditorCardShell(options) {
+ var settings = options || {};
+ var region = settings.region || {};
+ var cardClass = String(settings.cardClass || 'card card-outline card-secondary admin-form-card template-field-card mb-3');
+ var cardAttrs = String(settings.cardAttrs || '');
+ var cardStyle = settings.cardStyle ? ' style="' + escapeHtml(settings.cardStyle) + '"' : '';
+ var bodyClass = String(settings.bodyClass || 'card-body p-3 d-grid');
+ var bodyAttrs = String(settings.bodyAttrs || '');
+ var bodyStyle = settings.bodyStyle ? ' style="' + escapeHtml(settings.bodyStyle) + '"' : '';
+ var headerActions = String(settings.headerActions || '');
+ var bodyHtml = String(settings.bodyHtml || '');
+
+ return '' +
+ '' +
+ '' +
+ ' ' + bodyHtml + ' ' +
+ ' ';
}
root.pulseRegionTypes = {
@@ -111,6 +144,7 @@
list: list,
getDefaultRegionSize: getDefaultRegionSize,
getDefaultRegionStyle: getDefaultRegionStyle,
- getRegionChipLabel: getRegionChipLabel
+ getRegionChipLabel: getRegionChipLabel,
+ renderEditorCardShell: renderEditorCardShell
};
}());
\ No newline at end of file
diff --git a/src/web/public/js/regions/region-utils.js b/src/web/public/js/regions/region-utils.js
index 8d96800..5fb243b 100644
--- a/src/web/public/js/regions/region-utils.js
+++ b/src/web/public/js/regions/region-utils.js
@@ -178,12 +178,25 @@
return 'video';
}
+ if (button && button.hasAttribute('data-remove-region-qr-image')) {
+ return 'qr-image';
+ }
+
if (button && button.hasAttribute('data-remove-region-image')) {
return 'image';
}
if (card && card.dataset && String(card.dataset.regionMediaType || '').trim()) {
- return String(card.dataset.regionMediaType || '').trim() === 'video' ? 'video' : 'image';
+ var regionMediaType = String(card.dataset.regionMediaType || '').trim();
+ if (regionMediaType === 'video') {
+ return 'video';
+ }
+
+ if (regionMediaType === 'qr-image') {
+ return 'qr-image';
+ }
+
+ return 'image';
}
return 'image';
@@ -194,7 +207,15 @@
return callbacks.getExistingMediaPrefix(mediaType);
}
- return String(mediaType || '').trim() === 'video' ? 'existing_region_video_' : 'existing_region_image_';
+ if (String(mediaType || '').trim() === 'video') {
+ return 'existing_region_video_';
+ }
+
+ if (String(mediaType || '').trim() === 'qr-image') {
+ return 'existing_region_qr_image_';
+ }
+
+ return 'existing_region_image_';
}
function getMediaPrefix(mediaType) {
@@ -202,7 +223,15 @@
return callbacks.getMediaPrefix(mediaType);
}
- return String(mediaType || '').trim() === 'video' ? 'region_video_' : 'region_image_';
+ if (String(mediaType || '').trim() === 'video') {
+ return 'region_video_';
+ }
+
+ if (String(mediaType || '').trim() === 'qr-image') {
+ return 'region_qr_image_';
+ }
+
+ return 'region_image_';
}
function getVideoDurationHiddenInput(regionId) {
@@ -214,18 +243,33 @@
}
function handleRemove(button) {
- var regionId = button.getAttribute('data-remove-region-image') || button.getAttribute('data-remove-region-video');
+ var regionId = button.getAttribute('data-remove-region-image') || button.getAttribute('data-remove-region-video') || button.getAttribute('data-remove-region-qr-image');
var card = getCard(regionId);
var mediaType = getMediaType(button, card);
- var hidden = card && card.querySelector('input[type="hidden"][name="' + getExistingPrefix(mediaType) + regionId + '"]');
- var input = card && card.querySelector('input[type="file"][name="' + getMediaPrefix(mediaType) + regionId + '"]');
+ var hiddenName = getExistingPrefix(mediaType) + regionId;
+ var inputName = getMediaPrefix(mediaType) + regionId;
+ var hidden = card && card.querySelector('input[type="hidden"][name="' + hiddenName + '"]');
+ var input = card && card.querySelector('input[type="file"][name="' + inputName + '"]');
+
+ if (!hidden && regionId) {
+ hidden = templateFields.querySelector('input[type="hidden"][name="' + hiddenName + '"]');
+ }
+
+ if (!input && regionId) {
+ input = templateFields.querySelector('input[type="file"][name="' + inputName + '"]');
+ }
var uploadPath = input ? String(input.dataset.uploadedPath || '').trim() : '';
+ var hasPendingUpload = input && input.dataset && String(input.dataset.uploadToken || '').trim();
if (input && input.dataset.previewUrl) {
URL.revokeObjectURL(input.dataset.previewUrl);
delete input.dataset.previewUrl;
}
+ if (input && hasPendingUpload) {
+ input.dataset.uploadCancelRequested = '1';
+ }
+
if (input && input.dataset.uploadedNeedsCleanup === '1' && uploadPath && typeof callbacks.queueUploadCleanup === 'function') {
callbacks.queueUploadCleanup([uploadPath]);
}
@@ -238,6 +282,7 @@
if (hidden) {
hidden.value = '';
+ hidden.dispatchEvent(new Event('change', { bubbles: true }));
}
var durationHidden = getVideoDurationHiddenInput(regionId);
@@ -259,7 +304,7 @@
}
templateFields.addEventListener('click', function (event) {
- var button = event.target && event.target.closest ? event.target.closest('[data-remove-region-image], [data-remove-region-video]') : null;
+ var button = event.target && event.target.closest ? event.target.closest('[data-remove-region-image], [data-remove-region-video], [data-remove-region-qr-image]') : null;
if (!button || !templateFields.contains(button)) {
return;
@@ -273,7 +318,7 @@
return;
}
- var button = event.target && event.target.closest ? event.target.closest('[data-remove-region-image], [data-remove-region-video]') : null;
+ var button = event.target && event.target.closest ? event.target.closest('[data-remove-region-image], [data-remove-region-video], [data-remove-region-qr-image]') : null;
if (!button || !templateFields.contains(button)) {
return;
@@ -304,7 +349,15 @@
return callbacks.getMediaTypeFromInput(input);
}
- return input && input.name && input.name.indexOf('region_video_') === 0 ? 'video' : 'image';
+ if (input && input.name && input.name.indexOf('region_video_') === 0) {
+ return 'video';
+ }
+
+ if (input && input.name && input.name.indexOf('region_qr_image_') === 0) {
+ return 'qr-image';
+ }
+
+ return 'image';
}
function getMediaPrefix(mediaType) {
@@ -312,7 +365,15 @@
return callbacks.getMediaPrefix(mediaType);
}
- return String(mediaType || '').trim() === 'video' ? 'region_video_' : 'region_image_';
+ if (String(mediaType || '').trim() === 'video') {
+ return 'region_video_';
+ }
+
+ if (String(mediaType || '').trim() === 'qr-image') {
+ return 'region_qr_image_';
+ }
+
+ return 'region_image_';
}
function getExistingMediaPrefix(mediaType) {
@@ -320,7 +381,15 @@
return callbacks.getExistingMediaPrefix(mediaType);
}
- return String(mediaType || '').trim() === 'video' ? 'existing_region_video_' : 'existing_region_image_';
+ if (String(mediaType || '').trim() === 'video') {
+ return 'existing_region_video_';
+ }
+
+ if (String(mediaType || '').trim() === 'qr-image') {
+ return 'existing_region_qr_image_';
+ }
+
+ return 'existing_region_image_';
}
function getUploadZone(input) {
@@ -440,7 +509,7 @@
}
function getPendingUploadCleanupPaths() {
- return Array.prototype.slice.call(templateFields.querySelectorAll('input[type="file"][name^="region_image_"], input[type="file"][name^="region_video_"]')).map(function (input) {
+ return Array.prototype.slice.call(templateFields.querySelectorAll('input[type="file"][name^="region_image_"], input[type="file"][name^="region_video_"], input[type="file"][name^="region_qr_image_"]')).map(function (input) {
if (!input || String(input.dataset.uploadedNeedsCleanup || '') !== '1') {
return null;
}
@@ -450,7 +519,7 @@
}
function clearPendingUploadCleanupPaths() {
- Array.prototype.slice.call(templateFields.querySelectorAll('input[type="file"][name^="region_image_"], input[type="file"][name^="region_video_"]')).forEach(function (input) {
+ Array.prototype.slice.call(templateFields.querySelectorAll('input[type="file"][name^="region_image_"], input[type="file"][name^="region_video_"], input[type="file"][name^="region_qr_image_"]')).forEach(function (input) {
if (!input) {
return;
}
@@ -465,7 +534,7 @@
}
var mediaType = getMediaTypeFromInput(input);
- var regionId = input.name.replace(/^region_(?:image|video)_/, '');
+ var regionId = input.name.replace(/^region_(?:image|video|qr_image)_/, '');
var card = getCard(regionId);
var hidden = card && card.querySelector('input[type="hidden"][name="' + getExistingMediaPrefix(mediaType) + regionId + '"]');
var zone = getUploadZone(input);
@@ -475,6 +544,7 @@
var uploadUrl = String(callbacks.uploadUrl || '/slides/uploads');
var uploadTimeoutMs = Math.max(1, Number(callbacks.uploadTimeoutMs || 30000));
+ delete input.dataset.uploadCancelRequested;
input.dataset.uploadToken = uploadToken;
setUploadState(input, true, 0, 'Uploading...', true);
@@ -549,8 +619,19 @@
delete input.dataset.previewUrl;
}
+ if (String(input.dataset.uploadCancelRequested || '') === '1') {
+ if (uploadedPath) {
+ queueUploadCleanup([uploadedPath]);
+ }
+
+ setUploadState(input, false);
+ resolve(payload);
+ return;
+ }
+
if (hidden) {
hidden.value = uploadedPath;
+ hidden.dispatchEvent(new Event('change', { bubbles: true }));
}
input.dataset.uploadedPath = uploadedPath;
input.dataset.uploadedNeedsCleanup = '1';
@@ -611,6 +692,7 @@
xhr.onloadend = function () {
if (input.dataset.uploadToken === uploadToken) {
delete input.dataset.uploadToken;
+ delete input.dataset.uploadCancelRequested;
setUploadState(input, false);
}
};
@@ -647,7 +729,7 @@
templateFields.dataset.regionMediaUploadBound = '1';
templateFields.addEventListener('change', function (event) {
- var input = event.target && event.target.matches && event.target.matches('input[type="file"][name^="region_image_"], input[type="file"][name^="region_video_"]') ? event.target : null;
+ var input = event.target && event.target.matches && event.target.matches('input[type="file"][name^="region_image_"], input[type="file"][name^="region_video_"], input[type="file"][name^="region_qr_image_"]') ? event.target : null;
if (!input || !templateFields.contains(input)) {
return;
diff --git a/src/web/public/js/regions/type/api.js b/src/web/public/js/regions/type/api.js
index 16706c9..a0b04ac 100644
--- a/src/web/public/js/regions/type/api.js
+++ b/src/web/public/js/regions/type/api.js
@@ -232,7 +232,6 @@
'' +
'' +
'' +
- 'Use transforms like {{name.upper()}}, {{name.title()}}, or {{name.lower()}} on leaf fields. ' +
'' +
' Available placeholders ' +
' ' + ((placeholderFields.length && window.placeholderChips && typeof window.placeholderChips.renderChips === 'function') ? window.placeholderChips.renderChips(placeholderFields) : placeholderChips || 'No JSON fields available.') + ' ' +
diff --git a/src/web/public/js/regions/type/html.js b/src/web/public/js/regions/type/html.js
index db031fe..4361218 100644
--- a/src/web/public/js/regions/type/html.js
+++ b/src/web/public/js/regions/type/html.js
@@ -20,19 +20,13 @@
function renderEditorCard(context) {
var region = context.region;
var current = String(context.current || '');
- return '' +
- ' ';
+ return registry.renderEditorCardShell({
+ region: region,
+ headerActions: ' HTML',
+ bodyHtml: '' +
+ ' ' +
+ ' HTML is rendered in a sandboxed iframe preview. '
+ });
}
registry.register('html', {
diff --git a/src/web/public/js/regions/type/image.js b/src/web/public/js/regions/type/image.js
index 4f9f14d..1403744 100644
--- a/src/web/public/js/regions/type/image.js
+++ b/src/web/public/js/regions/type/image.js
@@ -34,47 +34,44 @@
var uploadMaxLabel = String(uploadConfig.limitLabel || context.uploadMaxLabel || '100 MB');
var uploadAccept = Array.isArray(uploadConfig.accept) ? uploadConfig.accept.join(', ') : String(uploadConfig.accept || 'image/png, image/jpeg, image/gif, image/webp');
var uploadHelpText = String(uploadConfig.helpText || 'PNG, JPG, GIF, or WebP');
- return '' +
- ' ' +
' ' +
' ' +
- ' Use transforms like {{title.upper()}}, {{title.title()}}, or {{title.lower()}} on leaf fields. ' +
' ' +
' Available placeholders ' +
' ' + (placeholderChips || 'No RSS fields available.') + ' ' +
+ ' Placeholder values support transforms, for example {{title.upper()}}, {{title.title()}}, {{title.lower()}}, or {{publishedAt.format("MMM D, YYYY")}}. ' +
' ' +
' ' +
'';
@@ -250,6 +257,7 @@
var region = context.region;
var current = context.current || {};
var config = context.config || {};
+ var itemNumberLimit = Math.max(1, Number(getFeedItemCount(config.feed_id, feeds) || 1));
var placeholderChips = String(context.placeholderChips || '');
var feedOptions = String(context.feedOptions || '');
@@ -257,6 +265,7 @@
region: region,
current: current,
config: config,
+ itemNumberLimit: itemNumberLimit,
fontSize: context.fontSize || '',
placeholderChips: placeholderChips,
feedOptions: feedOptions,
diff --git a/src/web/public/js/regions/type/rtmp.js b/src/web/public/js/regions/type/rtmp.js
index d828fe9..ee0ad45 100644
--- a/src/web/public/js/regions/type/rtmp.js
+++ b/src/web/public/js/regions/type/rtmp.js
@@ -21,24 +21,12 @@
function renderEditorCard(context) {
var region = context.region;
var current = String(context.current || '');
- var disableAudio = context.disableAudio === undefined ? false : Boolean(context.disableAudio);
- return '' +
- '';
+ return registry.renderEditorCardShell({
+ region: region,
+ headerActions: 'RTMP',
+ bodyHtml: '' +
+ ''
+ });
}
registry.register('rtmp', {
diff --git a/src/web/public/js/regions/type/schedule.js b/src/web/public/js/regions/type/schedule.js
index d336730..8e992fd 100644
--- a/src/web/public/js/regions/type/schedule.js
+++ b/src/web/public/js/regions/type/schedule.js
@@ -219,7 +219,7 @@
'' +
' Available placeholders ' +
' ' + renderSchedulePlaceholderChips(currentGroup, currentEntries) + ' ' +
- ' Format start and end values with expressions like {{start.format("MMM D, YYYY h:mm A")}} and {{end.format("MMM D, YYYY h:mm A")}}. ' +
+ ' Placeholder values support transforms, for example {{title.upper()}}, {{title.title()}}, {{title.lower()}} or {{start.format("MMM D, YYYY h:mm A")}}. ' +
' ' +
'' +
'' +
diff --git a/src/web/public/js/regions/type/video.js b/src/web/public/js/regions/type/video.js
index 7b82a09..8ea5b94 100644
--- a/src/web/public/js/regions/type/video.js
+++ b/src/web/public/js/regions/type/video.js
@@ -39,48 +39,45 @@
var uploadVideoMaxLabel = String(uploadConfig.limitLabel || context.uploadVideoMaxLabel || '1 GB');
var uploadAccept = Array.isArray(uploadConfig.accept) ? uploadConfig.accept.join(', ') : String(uploadConfig.accept || 'video/mp4, video/webm, video/ogg');
var uploadHelpText = String(uploadConfig.helpText || 'MP4, WebM, or Ogg');
- return '' +
- ' |
- {{#if (anyPermission ../currentUser 'api-sources.update' 'api-sources.delete')}}
+ {{#if (anyPermission ../currentUser 'api-sources.create' 'api-sources.update' 'api-sources.delete')}}
{{#if (hasPermission ../currentUser 'api-sources.update')}}
Edit
{{/if}}
+ {{#if (hasPermission ../currentUser 'api-sources.create')}}
+ Dupe
+ {{/if}}
{{#if (hasPermission ../currentUser 'api-sources.delete')}}
| |