Release v2.4.2

2026-08-03 12:45:27 +01:00
parent 2b9cabdab2
commit e95928f31c
141 changed files with 7694 additions and 5078 deletions
@@ -1,41 +1,8 @@
-// Announcement add page renderer and form defaults.
+// Announcement add page renderer.

 const { renderView } = require('../../../view');
-const { DEFAULT_ANNOUNCEMENT_ICON } = require('#src/data/announcement-icons');
+const { buildAnnouncementFormViewModel } = require('./form-view-model');

-function buildDefaultAnnouncement() {
-  return {
-    id: null,
-    message: '',
-    short_label: '',
-    announcement_type: 'lower-third',
-    color_key: 'primary',
-    icon_key: DEFAULT_ANNOUNCEMENT_ICON,
-    durationMode: 'duration',
-    duration_seconds: null,
-    durationValue: 5,
-    durationUnit: 'minutes',
-    durationLabel: 'Until disabled',
-    screen_ids: []
-  };
-}
-
-module.exports = function renderAnnouncementFormPage(announcement, mode, message, currentUser, options) {
-  const isEdit = mode === 'edit';
-  const announcementTypes = Array.isArray(options && options.announcementTypes) ? options.announcementTypes : [];
-  const announcementColors = Array.isArray(options && options.announcementColors) ? options.announcementColors : [];
-  const announcementIcons = Array.isArray(options && options.announcementIcons) ? options.announcementIcons : [];
-  const announcementScreens = Array.isArray(options && options.announcementScreens) ? options.announcementScreens : [];
-
-  return renderView(isEdit ? 'signage/announcements/edit' : 'signage/announcements/add', {
-    title: isEdit ? 'Edit announcement' : 'Add announcement',
-    active: 'announcements',
-    message: message,
-    currentUser: currentUser || null,
-    announcement: Object.assign({}, buildDefaultAnnouncement(), announcement || {}),
-    announcementTypes: announcementTypes,
-    announcementColors: announcementColors,
-    announcementIcons: announcementIcons,
-    announcementScreens: announcementScreens
-  });
+module.exports = function renderAnnouncementAddPage(announcement, message, currentUser, options) {
+  return renderView('signage/announcements/form', buildAnnouncementFormViewModel(announcement, message, currentUser, options, false));
 };