Ux/54 help (#88)

* ux/54-help tooltips
* ux/54-help refetch after mutation
* ux/54-help broadcast event index
* ux/54-help prevent multiple keypresses when key held
* ux/54-help fat clock
* ux/54-help progress bar user defined
* ux/54-help onAir is button
* ux/54-help OSC: add missing presenter message
* ux/54-help OSC: enable / disable OSC
* ux/54-help handle timezone in excel date import
* ux/54-help tray left click to show app
* ux/54-help create queriable endpoint
* ux/54-help fix memoisation in lower thirds
* ux/54-help revise icons
* ux/54-help clarify text
* ux/54-help forgiving text parsing
* ux/54-help add smart keywords
* ux/54-help version bump

server/src/controllers/eventsController.js

@@ -1,12 +1,12 @@
 // get database
-import { db, data } from '../app.js';
+import { data, db } from '../app.js';
 
 // utils
 import { generateId } from 'ontime-utils/generate_id.js';
 import {
-  event as eventDef,
-  delay as delayDef,
   block as blockDef,
+  delay as delayDef,
+  event as eventDef,
 } from '../models/eventsDefinition.js';
 
 async function _insertAt(entry, index) {
@@ -73,9 +73,14 @@ export const eventsGetAll = async (req, res) => {
 // Create controller for GET request to '/events/:eventId'
 // Returns -
 export const eventsGetById = async (req, res) => {
-  const e = data.events.find({ id: req.params.eventId }).value();
-  console.log('event by id', e);
-  res.json(e);
+  const id = req.params?.eventId;
+
+  if (id == null) {
+    res.status(400).send(`No eventId found in request`);
+  } else {
+    const event = data.events.find((e) => e.id === id);
+    res.json(event);
+  }
 };
 
 // Create controller for POST request to '/events/'
@@ -89,23 +94,24 @@ export const eventsPost = async (req, res) => {
 
   // ensure structure
   let newEvent = {};
-  req.body.id = generateId();
+  let id = req.body.id;
+  if (data.events.find((e) => e.id === id)) {
+    id = generateId();
+  }
 
   switch (req.body.type) {
     case 'event':
-      newEvent = { ...eventDef, ...req.body };
+      newEvent = { ...eventDef, ...req.body, id };
       break;
     case 'delay':
-      newEvent = { ...delayDef, ...req.body };
+      newEvent = { ...delayDef, ...req.body, id };
       break;
     case 'block':
-      newEvent = { ...blockDef, ...req.body };
+      newEvent = { ...blockDef, ...req.body, id };
       break;
 
     default:
-      res
-        .status(400)
-        .send(`Object type missing or unrecognised: ${req.body.type}`);
+      res.status(400).send(`Object type missing or unrecognised: ${req.body.type}`);
       break;
   }
 

server/src/controllers/ontimeController.js

@@ -3,7 +3,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 
 // get database
-import { db, data } from '../app.js';
+import { data, db } from '../app.js';
 import { networkInterfaces } from 'os';
 import { fileHandler } from '../utils/parser.js';
 import { generateId } from 'ontime-utils/generate_id.js';
@@ -15,6 +15,19 @@ function getEventTitle() {
   return data.event.title;
 }
 
+// Create controller for GET request to '/ontime/poll'
+// Returns data for current state
+export const poll = async (req, res) => {
+  try {
+    const s = global.timer.poll();
+    res.status(200).send(s);
+  } catch (error) {
+    res.status(500).send({
+      message: `Could not get sync data: ${error}`,
+    });
+  }
+};
+
 // Create controller for GET request to '/ontime/db'
 // Returns -
 export const dbDownload = async (req, res) => {

server/src/controllers/playbackController.js

@@ -1,7 +1,7 @@
 // Create controller for GET request to '/playback'
 // Returns ACK message
 export const pbGet = async (req, res) => {
-  res.send(global.timer.playState);
+  res.send({ playback: global.timer.state });
 };
 
 // Create controller for GET request to '/playback/onAir'