diff --git a/client/src/features/editors/list/EventBlock.jsx b/client/src/features/editors/list/EventBlock.jsx index e9cba4876..2d0aa1042 100644 --- a/client/src/features/editors/list/EventBlock.jsx +++ b/client/src/features/editors/list/EventBlock.jsx @@ -14,6 +14,8 @@ import style from './EventBlock.module.css'; const ExpandedBlock = (props) => { const { provided, data, next, delay, delayValue, actionHandler } = props; + const oscid = data.id.length > 4 ? '...' : data.id; + return ( <> @@ -69,6 +71,7 @@ const ExpandedBlock = (props) => { actionHandler('update', { field: 'note', value: v }) } /> + {`OSC ID: ${oscid}`} e.id === eventId); + + console.log( + eventId, + this.selectedEventId, + eventIndex === this.selectedEventId + ); + + if (eventIndex === -1) return; + this.pause(); + this.loadEvent(eventIndex); + + this.broadcastState(); + } + // Loads a given event // load timers // load selectedEvent diff --git a/server/controllers/OscController.js b/server/controllers/OscController.js index d10b1c2c4..aca04e662 100644 --- a/server/controllers/OscController.js +++ b/server/controllers/OscController.js @@ -56,6 +56,7 @@ const initiateOSC = (config) => { break; case 'goto': console.log('calling goto with', args); + global.timer.loadEventById(args.toLowerCase()); break; default: diff --git a/server/controllers/eventsController.js b/server/controllers/eventsController.js index e9ab335c3..6fbc41551 100644 --- a/server/controllers/eventsController.js +++ b/server/controllers/eventsController.js @@ -2,7 +2,8 @@ const db = require('../app.js').db; // utils -const { nanoid } = require('nanoid'); +const customAlphabet = require('nanoid').customAlphabet; +const nanoid = customAlphabet('1234567890abcdef', 4); const eventDefs = require('../data/eventsDefinition.js'); function _getEventsCount() { @@ -85,7 +86,7 @@ exports.eventsPost = async (req, res) => { // ensure structure let newEvent = {}; - req.body.id = nanoid(6); + req.body.id = nanoid(); switch (req.body.type) { case 'event':