diff --git a/apps/server/src/api-data/rundown/rundown.controller.ts b/apps/server/src/api-data/rundown/rundown.controller.ts index d5c77d4cb..0c196fc55 100644 --- a/apps/server/src/api-data/rundown/rundown.controller.ts +++ b/apps/server/src/api-data/rundown/rundown.controller.ts @@ -19,7 +19,6 @@ import { deleteEvent, editEvent, reorderEvent, - setFrozenState, swapEvents, } from '../../services/rundown-service/RundownService.js'; import { @@ -127,17 +126,6 @@ export async function rundownBatchPut(req: Request, res: Response) { - try { - const { frozen } = req.body; - setFrozenState(frozen); - res.status(200).send({ message: 'Rundown frozen state updated.' }); - } catch (error) { - const message = getErrorMessage(error); - res.status(400).send({ message }); - } -} - export async function rundownReorder(req: Request, res: Response) { if (failEmptyObjects(req.body, res)) { return; diff --git a/apps/server/src/api-data/rundown/rundown.middleware.ts b/apps/server/src/api-data/rundown/rundown.middleware.ts deleted file mode 100644 index 41f2d852e..000000000 --- a/apps/server/src/api-data/rundown/rundown.middleware.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { eventStore } from '../../stores/EventStore.js'; - -export const preventIfFrozen = function (req, res, next) { - if (eventStore.get('frozen')) { - res.status(403).send({ message: 'Rundown is frozen' }); - } else { - next(); - } -}; diff --git a/apps/server/src/api-data/rundown/rundown.router.ts b/apps/server/src/api-data/rundown/rundown.router.ts index 5cefd66d6..ebac101cb 100644 --- a/apps/server/src/api-data/rundown/rundown.router.ts +++ b/apps/server/src/api-data/rundown/rundown.router.ts @@ -5,7 +5,6 @@ import { rundownApplyDelay, rundownBatchPut, rundownDelete, - rundownFrozenPost, rundownGetAll, rundownGetById, rundownGetNormalised, @@ -19,14 +18,12 @@ import { paramsMustHaveEventId, rundownArrayOfIds, rundownBatchPutValidator, - rundownFrozenPostValidator, rundownGetPaginatedQueryParams, rundownPostValidator, rundownPutValidator, rundownReorderValidator, rundownSwapValidator, } from './rundown.validation.js'; -import { preventIfFrozen } from './rundown.middleware.js'; export const router = express.Router(); @@ -36,14 +33,13 @@ router.get('/normalised', rundownGetNormalised); router.get('/:eventId', paramsMustHaveEventId, rundownGetById); // not used in Ontime frontend router.post('/', rundownPostValidator, rundownPost); -router.post('/frozen', rundownFrozenPostValidator, rundownFrozenPost); router.put('/', rundownPutValidator, rundownPut); router.put('/batch', rundownBatchPutValidator, rundownBatchPut); -router.patch('/reorder/', rundownReorderValidator, preventIfFrozen, rundownReorder); -router.patch('/swap', rundownSwapValidator, preventIfFrozen, rundownSwap); +router.patch('/reorder/', rundownReorderValidator, rundownReorder); +router.patch('/swap', rundownSwapValidator, rundownSwap); router.patch('/applydelay/:eventId', paramsMustHaveEventId, rundownApplyDelay); -router.delete('/', rundownArrayOfIds, preventIfFrozen, deletesEventById); -router.delete('/all', preventIfFrozen, rundownDelete); +router.delete('/', rundownArrayOfIds, deletesEventById); +router.delete('/all', rundownDelete); diff --git a/apps/server/src/api-data/rundown/rundown.validation.ts b/apps/server/src/api-data/rundown/rundown.validation.ts index 117fb6fdc..2de741ff9 100644 --- a/apps/server/src/api-data/rundown/rundown.validation.ts +++ b/apps/server/src/api-data/rundown/rundown.validation.ts @@ -21,15 +21,6 @@ export const rundownPutValidator = [ }, ]; -export const rundownFrozenPostValidator = [ - body('frozen').isBoolean().exists(), - (req: Request, res: Response, next: NextFunction) => { - const errors = validationResult(req); - if (!errors.isEmpty()) return res.status(422).json({ errors: errors.array() }); - next(); - }, -] - export const rundownBatchPutValidator = [ body('data').isObject().exists(), body('ids').isArray().exists(), diff --git a/apps/server/src/app.ts b/apps/server/src/app.ts index d01d551d7..751808032 100644 --- a/apps/server/src/app.ts +++ b/apps/server/src/app.ts @@ -202,7 +202,6 @@ export const startServer = async ( playback: SimplePlayback.Stop, direction: SimpleDirection.CountDown, }, - frozen: false, ping: -1, }); diff --git a/apps/server/src/services/rundown-service/RundownService.ts b/apps/server/src/services/rundown-service/RundownService.ts index bd008d7a8..3fa8c3ef7 100644 --- a/apps/server/src/services/rundown-service/RundownService.ts +++ b/apps/server/src/services/rundown-service/RundownService.ts @@ -21,7 +21,6 @@ import { runtimeService } from '../runtime-service/RuntimeService.js'; import * as cache from './rundownCache.js'; import { getPlayableEvents, getTimedEvents } from './rundownUtils.js'; -import { eventStore } from '../../stores/EventStore.js'; type PatchWithId = (Partial | Partial | Partial) & { id: string }; @@ -275,7 +274,3 @@ export async function initRundown(rundown: Readonly, customFields // notify timer of change notifyChanges({ timer: true, external: true, reload: true }); } - -export async function setFrozenState(state: boolean) { - eventStore.set('frozen', state); -} diff --git a/packages/types/src/definitions/runtime/RuntimeStore.ts b/packages/types/src/definitions/runtime/RuntimeStore.ts index 13dec8b30..bed1a8229 100644 --- a/packages/types/src/definitions/runtime/RuntimeStore.ts +++ b/packages/types/src/definitions/runtime/RuntimeStore.ts @@ -51,6 +51,5 @@ export const runtimeStorePlaceholder: RuntimeStore = { duration: 0, playback: SimplePlayback.Stop, }, - frozen: false, ping: -1, }; diff --git a/packages/types/src/definitions/runtime/RuntimeStore.type.ts b/packages/types/src/definitions/runtime/RuntimeStore.type.ts index 074b04c9f..b2886441c 100644 --- a/packages/types/src/definitions/runtime/RuntimeStore.type.ts +++ b/packages/types/src/definitions/runtime/RuntimeStore.type.ts @@ -25,7 +25,6 @@ export type RuntimeStore = { // extra timers auxtimer1: SimpleTimerState; - // flags - frozen: boolean; + // utils ping: number; };