mirror of
https://github.com/cpvalente/ontime.git
synced 2026-08-10 18:03:47 +00:00
c8e979bc9a
* Refactor/ts sockets (#210) * refactor(ts): create socket subscription service * refactor(ts-sockets): useSubscription hook * refactor(ts-sockets): extract colour selection to utility * Refactor/socket controller (#212) * refactor(socket): dictionary cleanup * refactor(socket): detangle socket from EventTimer * refactor(socket): poll object * refactor(socket): wip, extract data responsibilities to provider * fix: issue with onAir * refactor: create data provider and validation utils * refactor: remove deprecated endpoint * refactor: detangle and validate ontime controller * refactor: detangle and validate events controller * refactor: validate routers * refactor: handle post failure in modals * chore: upgrade electron (#215) * Fix: issue with text colour (#214) * fix: adjust text colour from context * fix: issue with wrong proptype * chore: upgrade electron * chore: declare node version * chore: upgrade node actions * Feat/55 v2 (#225) * chore: upgrade relevant libraries * feat(skip): add skip styling to paginated items * chore: upgrade relevant libraries * Fix: issue with text colour (#214) * fix: adjust text colour from context * fix: issue with wrong proptype * fix issue with vite migration (#217) * hotfix: 1.8.2 issues vite migration * fix: file import options * feat(55): styling * refactor: remove onhover option for entry block * refactor: relocate logging provider * refactor: convert to typescript * feat(55): add event editor * refactor: extract event actions * fix: bad import * feat(55): redesign components * fix: issues with not awaiting async * refactor: replace socket with subscription * refactor: remove unused * style: small tweaks * refactor: extract event actions * refactor: cleanup debug * refactor: chakra imports * fix: optimistic mutations * refactor: handle promise rejections * refactor: validation * fix: rq optimistic mutations * feat: add playback feedback to block * refactor: no optimistic adding of events * refactor: simplify cursor state * styles: cleanup editor style * refactor: cleanup duration update * fix: revert package upgrade (issues with vitest) * fix: prevent cyclic imports * refactor: extract data fetcher * refactor: typescript migration * chore: update tests * fix: remove problematic (#228) * styles: v2 (#229) * style: revise selected style * style: revise editor styles * style: revise viewer styles * chore: update tests * v2:feat (#231) * style: element relationship * feat: utility to add first element * refactor: organise dir * ux: deleting element closes drawer * fix: issue with escaped characters * fix: issue with overflow in events list * fix: prevent event timer from receiving non event * style: prevent small shift on class change * style: visually detach event editor * fix: entry block knows last event * fix: skip event timer updates on non events * fix: prevent electron OPENGL error * style: cleanup text styles * style: unify input styles * refactor: simplify style and composition * refactor: tweaks on style + ts * refactor: add validation to events post * fix: handle non events in event timer * refactor: cleanup unused * V2 styles part2 (#233) * style: create tag to display network messages * style: create button style for playback * style: review style for QuickEntry * style: review style for Info panel * style: review style for Event blocks * style: review style for Message control panel * style: review style for Playback control * style: review application styles * style: review block styles * refactor: TapButton has active state * style: small style tweaks * refactor: type checks * V2 message manager (#234) * refactor: server run script * refactor: extract message control feature * refactor: socket usage for message control feature * refactor: migrate e2e testing to playwright * chore: add feature tests * refactor: add validation on socket controller * chore: jest tests server logic * chore: update tests * chore: run playwright tests on pull_requests * V2 rundown manager (#237) * refactor: migrate eventlist > rundown * hotfix: fix object naming error on excel import (#252) * feat: V2 ontime menu (#259) * V2 socket store (#254) * refactor: create socket utility * refactor: ensure a single subscription to topics * refactor: replace usages of socket object with subscription store handler * refactor: v2 event loader (#260) * refactor: extract jest config * refactor: rename params in reoder endpoint * refactor: avoid app exports * refactor: small code smells * refactor: run development server * refactor: extract rundown service and event loader logic * refactor: rename events > rundown * refactor: code style * fix: handle external change of title * refactor: cleanup dictionary * refactor: rename MessageService * refactor: use eventID for operations * refactor: migrate OSC controller to service * refactor: migrate Socket controller to service * refactor: migrate HTTP controller to service * refactor: extract logic into discrete services * refactor: remove rundown from event timer * refactor: remove duplicate * refactor: remove unused * chore: update tests * refactor: run test CI on master or manual run * lint: reorder imports * refactor: ensure consistent routing * V2 event block (#261) * feat: implement progress bar on running event * refactor: use event action hook * refactor: align backend data * v2 styling (#263) * feat: implement progress bar on running event * refactor: use event action hook * refactor: align backend data * style: v2 style tweaks * style: v2 style tweaks + ts <Info> * fix: fix delay increment calls * style: v2 style tweaks + ts <Playback> * style: v2 style tweaks + ts <EventEditor> * style: v2 style tweaks + ts <MessageControl> * fix: naming issue with message control socket endpoint * chore: upgrade style dependencies * style: v2 style tweaks + ts <MenuBar> * style: v2 style tweaks + ts <RundownMenu> * style: v2 style tweaks + ts <Playback> * fix: add selected and next information to EventTimer * style: v2 style tweaks + ts <EventBlock> * style: v2 style tweaks + ts <DelayBlock> * style: v2 style tweaks + ts <BlockBlock> * style: v2 style tweaks + ts <QuickEntry> * refactor: extract <TextInput> logic * chore: upgrade build dependencies * chore: folder structure refactor * fix: issue with dependency path in electron * chore: update version in demo db * v2: refactor (#264) * chore: upgrade dependencies * chore: remove unused * fix: issue with missing index data * fix: discrepancy on counting events * fix: swapped classes * fix: prevent attempting load in empty list * chore: cleanup completed * chore: remove unused * refactor: convert to typescript * refactor: migrate to new endpoints * refactor: convert to typescript * fix: prevent issue with undefined process * fix: small code smells * fix: issue with missing version variable on build * refactor: configure retries on data fetching * style: design review * fix: prevent cursor out of range * lint: react query linting * style: checkbox styles * v2 event editor (#265) * style: add cursor indicator in all blocks * style: prevent reflows on width * style: harmonise white range * ux: focus elements on cursor nav * ux: prevent focus on indicators * refactor: convert to typescript * fix: missing dependency * chore: add linter rules for dependency arrays * style: style editable component * style: tweak input styles * style: tweak switch styles * style: style tweaks * V2 sentry (#267) * chore: add sentry to frontend * chore: add sentry to server * chore: report only in production * chore: add sentry source maps * v2 alpha 3 (#272) * style: correct background colours * chore: add folder resolutions to vite * refactor: add auto refetch to HTTP APIs * fix: view settings override endpoint * refactor: memoize callbacks * fix: reorder reaching wrong data adapter * refactor: memoize callbacks * style: presentation cleanup * fix(delete): prevent flow with deleted event in playback * refactor: convert to typescript * refactor: small fixes and typescript conversion * ux: improve feedback on local changes * refactor: cleanup props * v2 event timer (#274) * lint: cleanup unused * refactor: rename component to avoid conflict * style: gap in element row * refactor: rename playstate -> playback * refactor: cleanup usages of timer and prepare integration manager * style: re-arrange button order * refactor: improve event loading * feat(timer-service): hot reload * fix: issue with duration input * chore: cleanup debug * refactor: resolve poll from runtime store * refactor: cleanup merge * refactor: small improvements in timer hot-reload * v2: views (#278) * config(sentry): instrumentation only in production * chore: upgrade deps * refactor: simplify and convert to ts * refactor: composition and styles * chore: remove deprecated deps * ux: close menu on click outside * style: small tweaks and clarifications * refactor: retire PiP view * ux: small tweaks * style: cleanup deprecated styles * chore: remove unused * refactor: remove usages of deprecated fields and improve null timer presentation * refactor: improve composition of countdown * style: cleanup overridable styles * ux: show event overtime status * style: correct logic in paused timers * v2: roll (#280) * ux: delete flow * style: small tweaks in interface * refactor: gracefully quit on error * fix: logic around updating events * chore: cleanup dictionary * refactor: improve DX on creating aux files * fix: safe destructure function return * refactor: safe handling of falsy timer values * fix: improve ux on stopping roll mode * chore: upgrade deps * feat: roll mode * refactor: remove unused * V2 monorepo (#285) * refactor(project structure): UI * refactor(project structure): extract utilities * refactor(project structure): remove unused * refactor(project structure): electron * refactor(project structure): server refactor: migrate to vitest refactor: monorepo config * refactor: extract application menu * refactor: exit process * refactor: extract tray menu * chore: electron build * Added Seconds in studio clock #282 --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> --------- Co-authored-by: Fabian Posenau <fabian.p99@gmx.de> Co-authored-by: Fabian Posenau <fabian@fphome.de> * Fix: #279 End Message in Minimal Timer (#286) * fix: Minimal View #279 end message --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * hotfix: resolve data directory (#288) * Feature/#276/qrcodes (#289) * bugfix: wrong format when on 12h format * update: website link in placeholder --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com> * V2 types (#291) * V2 integration (#293) * feat: integrations and lifecycles * refactor: prevent issues with start order * V2 fix offline (#294) * fix: resolve path to UI build in dev * fix: configure offline fetching * V2 fix socket (#296) * refactor: rename timer endpoint * refactor: typescript * refactor: rename eventData and viewSettings * refactor: message manager uses event store * style: alpha4 style tweaks (#299) * fix: backgroundcolor for .blockNotes (#300) Co-authored-by: Fabian Posenau <fabian@fphome.de> * Feat/countdown style (#290) * feat: Countdown Style --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> * fix: wrong parameter (#302) Co-authored-by: Fabian Posenau <fabian@fphome.de> * V2 fix timer (#304) * Feat/update check (#303) * feat: show latest version in settings modal --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * improve time input (#307) * add the ability to parse time like 2h20m --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * V2 ws store (#310) * Update TimerService.ts * refactor: message service publishes to store * refactor: several type improvements * V2 ws store wss (#309) * refactor: shared logging types * refactor: simplify message service consumption * refactor: create discrete logging system * refactor: move socket.io > websocket * Feat/end action (#308) * feat: end action --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> * V2 osc (#313) * chore: upgrade relevant deps * fix: electron app to tray * chore: cleanup dictionary * feat: handle several messages in a event * ux: disable irrelevant buttons in browser * feat: parse and validate subscriptions * feat: create UI for OSC Integration * fix: cleanup logger behaviour * feat: allow OSC settings to be changed at runtime * v2 alpha5 (#315) * fix: fetch in offline environments (#295) * add arm platforms to docker build --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * fix: docker build (#298) Co-authored-by: Fabian Posenau <fabian@fphome.de> * Timer: fix too many renders error when using ?progress (#305) * ux: remove duplicate showing of selected event * several small fixes and UX improvements --------- Co-authored-by: Fabian Posenau <fabian.p99@gmx.de> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Marks Polakovs <github@markspolakovs.me> * V2 docker (#312) * Create docker-ci.yml * docker build * add build app * path changes * delete double workflow * update docker run template * cleanup * resolve wierd path issue * wrong path * again wrong path * rename docker releases * move styles population and change to function call * re-add old build pipeline * rename buld file * feractor init function * refactor: startDb to initAssets * refactor: startDB to initAssets * fix: docker.cjs building whole app * fix: docker environment * update docker paths * update: build command * cleanup * cleanup: commented code --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * v2 lazy rundown (#317) * chore: update related deps * refactor: memoise entrypoints * refactor: store selectors * refactor: improve component performance * chore: remove unused dependencies * refactor: improve component dnd * V2 build (#319) * chore: build pipeline for v2 * chore: run unit tests * chore: configure sentry build * Update test_v2.yml * Update test_v2.yml * V2 e2e (#320) * chore: cleanup handling of a bad read * chore: configure e2e testing * chore: version bump * V2 align (#321) * fix: fetch in offline environments (#295) * Add arm platforms to docker build (#297) * add arm platforms to docker build --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * fix: docker build (#298) Co-authored-by: Fabian Posenau <fabian@fphome.de> * Timer: fix too many renders error when using ?progress (#305) * Timer: fix too many renders error when using ?progress * version bump (#314) * style: small tweaks * fix: prevent actions in roll mode * chore: update external assets * style: show shortcuts in quick blocks * refactor: revert optimisations on callbacks * fun: industry dictionary * style: indicators for event features --------- Co-authored-by: Fabian Posenau <fabian.p99@gmx.de> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Marks Polakovs <github@markspolakovs.me> * refactor: ensure start order (#322) * Update build_docker_v2.yml * V2 fix roll (#323) * chore: profile node * fix: always roll * Add translations for views (#325) (#328) * Add translations for views (#325) --------- Co-authored-by: Kevin <60135953+kev-ac@users.noreply.github.com> * feat: notify ws clients on rundown changes (#327) * V2 beta1 (#326) * style: labels on added time * style: remove mentions of PiP * refactor: unify usage of ms for timers * refactor: create events with 0 duration * style: several small tweaks * refactor: keep block when applying delays * feat: blocks have titles * style: improvements in time entry warnings * style: override progress bar styles * style: prevent overflow * feat: show character count in editor * refactor: provide initial payload * refactor: lower test boundary * refactor: get colour from swatches * style: rename title block * chore: version bump * style: fix info scroll * refactor: performance tweaks to event editor * chore: upgrade deps * refactor: prevent iterating on undefined * style: small style tweaks * fix: close editor on event delete * refactor: improve performance on EventBlock * style: small tweaks on blocks * chore: upgrade deps * chore: upgrade deps * style: ensure events are always visible * Fix/events enpoint (#329) * fix: sentry hangs node process * add onClick handler (#335) Co-authored-by: Fabian Posenau <fabian@fphome.de> * fix docker on different port (#337) Co-authored-by: Fabian Posenau <fabian@fphome.de> * V2 beta3 (#338) * chore: upgrade local build documentation * style: keep scrolling event in screen * feat: delay is time entry * refactor: remove unused * refactor: remove unused * refactor: batch store updates * refactor: virtually remove cap on events * refactor: style and behaviour tweaks to event block * style: tweaks on schedules * chore: remove sentry from server * style: reorder menu * chore: update docs * fix: resolve to static port in dev mode * V2 fix delay (#340) * fix: avoid modifying original objects * refactor: serve react as compressed br (#339) * refactor: changes in time input * V2 e2e playwright (#343) * test: create utility for uploading test-db * chore: upgrade deps * refactor: remove unused functions * chore: create testing boilerplate * test: upload showfile * refactor: parse time input (#351) * chore: vite upgrade (#354) * chore: upgrade vite * feat: edit mode (#344) * style: add mode selection to menu * style: rename rundown functions * feat: edit mode * fix: osc modal (#352) * refactor: parse time input * fix: form dirty flag on dynamic elements * style: cuesheet block (#355) * style: cuesheet show block title * style: cuesheet show full delay string * v2 about (#362) * chore: remove unused assets * feat: about ontime * refactor: cleanup unused * v2 beta 4 (#361) * ux: rename end action * chore: update demo db * style: tweaks on extracted rundown * chore: prevent console logs in production code * feat: go mode * style: remove window size limits * style: rename delete action * style: small tweaks on icons * fix: style override on params * chore: update test db * refactor: small code quality improvements * refactor: prevent circular imports * fix v2 roll timer (#363) * fix: roll update skips elapsed time * refactor: remove unused data * style: fix style in roll state * ux: content aware playback (#364) * v2 beta 4 bump (#367) * chore: update links to documentation * chore: version bump * Feature: quick start (#369) * feat: quick start modal * refactor: end message is part of view settings * refactor: small tweaks and type improvements * Feat/timer/stylechange (#341) * feat: multi color progress bar * add color support to minimal timer Co-Authored-By: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> * v2 beta5 modals (#377) * refactor: folder structure * style: modal wrapper * feat: add nordic translations * v2 beta 5 (#375) * chore: update documentation links * fix: sentry has no access to error context * style: clarify event history * fix: issue with clipboard write in safari * style: clarify event history * refactor: improvements to follow logic in rundown * refactor: improvements in go mode * several style tweaks and small improvements * Ux language (#378) * ux: language from menu * feat: add extra support for languages german portuguese spanish * refactor: type improvements * v2 beta6 (#379) * feat: operator key * chore: update demo * chore: version bump * fix: prevent stale keys * refactor: add new fields to validation * style: tweaks to modal arrangement * refactor: prevent parsing http * ux: click anywhere in event to edit * refactor: performance improvements to time input * refactor: performance improvements menu * V2 beta 6 (#381) * fix: fetch in offline environments (#295) * Add arm platforms to docker build (#297) * add arm platforms to docker build --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * fix: docker build (#298) Co-authored-by: Fabian Posenau <fabian@fphome.de> * Timer: fix too many renders error when using ?progress (#305) * Timer: fix too many renders error when using ?progress * version bump (#314) * chore: remove unused assets * refactor: improve rundown loading time * style: rename project file * chore: update demo files * refactor: improve loading time * chore: upgrade upload packages * refactor: modal redesign and ux improvements * refactor: type and ux improvements on translations * refactor: prevent flash on suspense * refactor: remove unnecessary import * chore: update tests * refactor: cleanup imports * fix: prevent flash on suspense --------- Co-authored-by: Fabian Posenau <fabian.p99@gmx.de> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Marks Polakovs <github@markspolakovs.me> * style views (#390) * style: animate transition from left side * refactor: improve schedule relationship * refactor: prevent passing unhandled value * style: remove inner radius in borders --------- Co-authored-by: Fabian Posenau <fabian.p99@gmx.de> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> Co-authored-by: Marks Polakovs <github@markspolakovs.me> Co-authored-by: Kevin <60135953+kev-ac@users.noreply.github.com>
588 lines
13 KiB
JavaScript
588 lines
13 KiB
JavaScript
import {
|
|
DAY_TO_MS,
|
|
getRollTimers,
|
|
normaliseEndTime,
|
|
sortArrayByProperty,
|
|
updateRoll,
|
|
} from '../rollUtils.ts';
|
|
|
|
// test sortArrayByProperty()
|
|
describe('sort simple arrays of objects', () => {
|
|
it('sort array 1-5', () => {
|
|
const arr1 = [{ timeStart: 1 }, { timeStart: 5 }, { timeStart: 3 }, { timeStart: 2 }, { timeStart: 4 }];
|
|
|
|
const arr1Expected = [{ timeStart: 1 }, { timeStart: 2 }, { timeStart: 3 }, { timeStart: 4 }, { timeStart: 5 }];
|
|
|
|
const sorted = sortArrayByProperty(arr1, 'timeStart');
|
|
expect(sorted).toStrictEqual(arr1Expected);
|
|
});
|
|
|
|
it('sort array 1-5 with null', () => {
|
|
const arr1 = [
|
|
{ timeStart: 1 },
|
|
{ timeStart: 5 },
|
|
{ timeStart: 3 },
|
|
{ timeStart: 2 },
|
|
{ timeStart: 4 },
|
|
{ timeStart: null },
|
|
];
|
|
|
|
const arr1Expected = [
|
|
{ timeStart: null },
|
|
{ timeStart: 1 },
|
|
{ timeStart: 2 },
|
|
{ timeStart: 3 },
|
|
{ timeStart: 4 },
|
|
{ timeStart: 5 },
|
|
];
|
|
|
|
const sorted = sortArrayByProperty(arr1, 'timeStart');
|
|
expect(sorted).toStrictEqual(arr1Expected);
|
|
});
|
|
});
|
|
|
|
// test getRollTimers()
|
|
describe('test that roll loads selection in right order', () => {
|
|
const eventlist = [
|
|
{
|
|
id: 1,
|
|
timeStart: 5,
|
|
timeEnd: 10,
|
|
isPublic: false,
|
|
},
|
|
{
|
|
id: 2,
|
|
timeStart: 10,
|
|
timeEnd: 20,
|
|
isPublic: false,
|
|
},
|
|
{
|
|
id: 3,
|
|
timeStart: 20,
|
|
timeEnd: 30,
|
|
isPublic: false,
|
|
},
|
|
{
|
|
id: 4,
|
|
timeStart: 30,
|
|
timeEnd: 40,
|
|
isPublic: false,
|
|
},
|
|
{
|
|
id: 5,
|
|
timeStart: 40,
|
|
timeEnd: 50,
|
|
isPublic: true,
|
|
},
|
|
{
|
|
id: 6,
|
|
timeStart: 50,
|
|
timeEnd: 60,
|
|
isPublic: false,
|
|
},
|
|
{
|
|
id: 7,
|
|
timeStart: 60,
|
|
timeEnd: 70,
|
|
isPublic: true,
|
|
},
|
|
{
|
|
id: 8,
|
|
timeStart: 70,
|
|
timeEnd: 80,
|
|
isPublic: false,
|
|
},
|
|
];
|
|
|
|
it('if timer is at 0', () => {
|
|
const now = 0;
|
|
const expected = {
|
|
nowIndex: null,
|
|
nowId: null,
|
|
publicIndex: null,
|
|
nextIndex: 0,
|
|
publicNextIndex: 4,
|
|
timeToNext: 5,
|
|
nextEvent: eventlist[0],
|
|
nextPublicEvent: eventlist[4],
|
|
currentEvent: null,
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 5', () => {
|
|
const now = 5;
|
|
const expected = {
|
|
nowIndex: 0,
|
|
nowId: eventlist[0].id,
|
|
publicIndex: null,
|
|
nextIndex: 1,
|
|
publicNextIndex: 4,
|
|
timeToNext: 5,
|
|
nextEvent: eventlist[1],
|
|
nextPublicEvent: eventlist[4],
|
|
currentEvent: eventlist[0],
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 15', () => {
|
|
const now = 15;
|
|
const expected = {
|
|
nowIndex: 1,
|
|
nowId: eventlist[1].id,
|
|
publicIndex: null,
|
|
nextIndex: 2,
|
|
publicNextIndex: 4,
|
|
timeToNext: 5,
|
|
nextEvent: eventlist[2],
|
|
nextPublicEvent: eventlist[4],
|
|
currentEvent: eventlist[1],
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 20', () => {
|
|
const now = 20;
|
|
const expected = {
|
|
nowIndex: 2,
|
|
nowId: eventlist[2].id,
|
|
publicIndex: null,
|
|
nextIndex: 3,
|
|
publicNextIndex: 4,
|
|
timeToNext: 10,
|
|
nextEvent: eventlist[3],
|
|
nextPublicEvent: eventlist[4],
|
|
currentEvent: eventlist[2],
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 49', () => {
|
|
const now = 49;
|
|
const expected = {
|
|
nowIndex: 4,
|
|
nowId: eventlist[4].id,
|
|
publicIndex: 4,
|
|
nextIndex: 5,
|
|
publicNextIndex: 6,
|
|
timeToNext: 1,
|
|
nextEvent: eventlist[5],
|
|
nextPublicEvent: eventlist[6],
|
|
currentEvent: eventlist[4],
|
|
currentPublicEvent: eventlist[4],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 63', () => {
|
|
const now = 63;
|
|
const expected = {
|
|
nowIndex: 6,
|
|
nowId: eventlist[6].id,
|
|
publicIndex: 6,
|
|
nextIndex: 7,
|
|
publicNextIndex: null,
|
|
timeToNext: 7,
|
|
nextEvent: eventlist[7],
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[6],
|
|
currentPublicEvent: eventlist[6],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 75', () => {
|
|
const now = 75;
|
|
const expected = {
|
|
nowIndex: 7,
|
|
nowId: eventlist[7].id,
|
|
publicIndex: 6,
|
|
nextIndex: null,
|
|
publicNextIndex: null,
|
|
timeToNext: null,
|
|
nextEvent: null,
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[7],
|
|
currentPublicEvent: eventlist[6],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 100', () => {
|
|
const now = 100;
|
|
const expected = {
|
|
nowIndex: null,
|
|
nowId: null,
|
|
publicIndex: null,
|
|
nextIndex: 0,
|
|
publicNextIndex: 4,
|
|
timeToNext: DAY_TO_MS - now + eventlist[0].timeStart,
|
|
nextEvent: eventlist[0],
|
|
nextPublicEvent: eventlist[4],
|
|
currentEvent: null,
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('handles rolls to next day with real values', () => {
|
|
const singleEventList = [
|
|
{
|
|
id: 1,
|
|
timeStart: 36000000, // 10:00
|
|
timeEnd: 39600000, // 11:00
|
|
isPublic: true,
|
|
},
|
|
];
|
|
const now = 64800000; // 18:00
|
|
const expected = {
|
|
nowIndex: null,
|
|
nowId: null,
|
|
publicIndex: null,
|
|
nextIndex: 0,
|
|
publicNextIndex: 0,
|
|
timeToNext: DAY_TO_MS - now + singleEventList[0].timeStart,
|
|
nextEvent: singleEventList[0],
|
|
nextPublicEvent: singleEventList[0],
|
|
currentEvent: null,
|
|
currentPublicEvent: null,
|
|
};
|
|
const state = getRollTimers(singleEventList, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
});
|
|
|
|
// test getRollTimers()
|
|
describe('test that roll behaviour with overlapping times', () => {
|
|
const eventlist = [
|
|
{
|
|
id: 1,
|
|
timeStart: 10,
|
|
timeEnd: 10,
|
|
isPublic: false,
|
|
},
|
|
{
|
|
id: 2,
|
|
timeStart: 10,
|
|
timeEnd: 20,
|
|
isPublic: true,
|
|
},
|
|
{
|
|
id: 3,
|
|
timeStart: 10,
|
|
timeEnd: 30,
|
|
isPublic: false,
|
|
},
|
|
];
|
|
|
|
it('if timer is at 0', () => {
|
|
const now = 0;
|
|
const expected = {
|
|
nowIndex: null,
|
|
nowId: null,
|
|
publicIndex: null,
|
|
nextIndex: 0,
|
|
publicNextIndex: 1,
|
|
timeToNext: 10,
|
|
nextEvent: eventlist[0],
|
|
nextPublicEvent: eventlist[1],
|
|
currentEvent: null,
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 10', () => {
|
|
const now = 10;
|
|
const expected = {
|
|
nowIndex: 1,
|
|
nowId: eventlist[1].id,
|
|
publicIndex: 1,
|
|
nextIndex: 2,
|
|
publicNextIndex: null,
|
|
timeToNext: 0,
|
|
nextEvent: eventlist[2],
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[1],
|
|
currentPublicEvent: eventlist[1],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 15', () => {
|
|
const now = 15;
|
|
const expected = {
|
|
nowIndex: 1,
|
|
nowId: eventlist[1].id,
|
|
publicIndex: 1,
|
|
nextIndex: 2,
|
|
publicNextIndex: null,
|
|
timeToNext: -5,
|
|
nextEvent: eventlist[2],
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[1],
|
|
currentPublicEvent: eventlist[1],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 20', () => {
|
|
const now = 20;
|
|
const expected = {
|
|
nowIndex: 2,
|
|
nowId: eventlist[2].id,
|
|
publicIndex: 1,
|
|
nextIndex: null,
|
|
publicNextIndex: null,
|
|
timeToNext: null,
|
|
nextEvent: null,
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[2],
|
|
currentPublicEvent: eventlist[1],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if timer is at 25', () => {
|
|
const now = 25;
|
|
const expected = {
|
|
nowIndex: 2,
|
|
nowId: eventlist[2].id,
|
|
publicIndex: 1,
|
|
nextIndex: null,
|
|
publicNextIndex: null,
|
|
timeToNext: null,
|
|
nextEvent: null,
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[2],
|
|
currentPublicEvent: eventlist[1],
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
});
|
|
|
|
// test getRollTimers() on issue #58
|
|
describe('test that roll behaviour multi day event edge cases', () => {
|
|
it('if the start time is the day after end time, and start time is earlier than now', () => {
|
|
const now = 66600000; // 19:30
|
|
const eventlist = [
|
|
{
|
|
id: 1,
|
|
timeStart: 66000000, // 19:20
|
|
timeEnd: 54600000, // 16:10
|
|
isPublic: false,
|
|
},
|
|
];
|
|
const expected = {
|
|
nowIndex: 0,
|
|
nowId: 1,
|
|
publicIndex: null,
|
|
nextIndex: null,
|
|
publicNextIndex: null,
|
|
timeToNext: null,
|
|
nextEvent: null,
|
|
nextPublicEvent: null,
|
|
currentEvent: eventlist[0],
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
|
|
it('if the start time is the day after end time, and both are later than now', () => {
|
|
const now = 66840000; // 19:34
|
|
const eventlist = [
|
|
{
|
|
id: 1,
|
|
timeStart: 67200000, // 19:40
|
|
timeEnd: 66900000, // 19:35
|
|
isPublic: false,
|
|
},
|
|
];
|
|
const expected = {
|
|
nowIndex: null,
|
|
nowId: null,
|
|
publicIndex: null,
|
|
nextIndex: 0,
|
|
publicNextIndex: null,
|
|
timeToNext: eventlist[0].timeStart - now,
|
|
nextEvent: eventlist[0],
|
|
nextPublicEvent: null,
|
|
currentEvent: null,
|
|
currentPublicEvent: null,
|
|
};
|
|
|
|
const state = getRollTimers(eventlist, now);
|
|
expect(state).toStrictEqual(expected);
|
|
});
|
|
});
|
|
|
|
// test normaliseEndTime() on issue #58
|
|
test('test typical scenarios', () => {
|
|
const t1 = {
|
|
start: 10,
|
|
end: 20,
|
|
};
|
|
const t1_expected = 20;
|
|
|
|
expect(normaliseEndTime(t1.start, t1.end)).toBe(t1_expected);
|
|
|
|
const t2 = {
|
|
start: 10 + DAY_TO_MS,
|
|
end: 20,
|
|
};
|
|
const t2_expected = 20 + DAY_TO_MS;
|
|
|
|
expect(normaliseEndTime(t2.start, t2.end)).toBe(t2_expected);
|
|
|
|
const t3 = {
|
|
start: 10,
|
|
end: 10,
|
|
};
|
|
const t3_expected = 10;
|
|
|
|
expect(normaliseEndTime(t3.start, t3.end)).toBe(t3_expected);
|
|
});
|
|
|
|
// test updateRoll()
|
|
describe('typical scenarios', () => {
|
|
it('it updates running events correctly', () => {
|
|
const timers = {
|
|
selectedEventId: 1,
|
|
current: 10,
|
|
_finishAt: 15,
|
|
clock: 11,
|
|
secondaryTimer: null,
|
|
secondaryTarget: null,
|
|
};
|
|
|
|
const expected = {
|
|
updatedTimer: timers._finishAt - timers.clock,
|
|
updatedSecondaryTimer: null,
|
|
doRollLoad: false,
|
|
isFinished: false,
|
|
};
|
|
|
|
expect(updateRoll(timers)).toStrictEqual(expected);
|
|
|
|
// test that it can jump time
|
|
timers._finishAt = 1000;
|
|
timers.clock = 600;
|
|
expected.updatedTimer = timers._finishAt - timers.clock;
|
|
|
|
expect(updateRoll(timers)).toStrictEqual(expected);
|
|
});
|
|
|
|
it('it updates secondary timer', () => {
|
|
const timers = {
|
|
selectedEventId: null,
|
|
current: null,
|
|
_finishAt: null,
|
|
clock: 11,
|
|
secondaryTimer: 1,
|
|
secondaryTarget: 15,
|
|
};
|
|
|
|
const expected = {
|
|
updatedTimer: null,
|
|
updatedSecondaryTimer: timers.secondaryTarget - timers.clock,
|
|
doRollLoad: false,
|
|
isFinished: false,
|
|
};
|
|
|
|
expect(updateRoll(timers)).toStrictEqual(expected);
|
|
});
|
|
|
|
it('flags an event end', () => {
|
|
const timers = {
|
|
selectedEventId: 1,
|
|
current: 10,
|
|
_finishAt: 11,
|
|
clock: 12,
|
|
secondaryTimer: null,
|
|
secondaryTarget: null,
|
|
};
|
|
|
|
const expected = {
|
|
updatedTimer: -1,
|
|
updatedSecondaryTimer: null,
|
|
doRollLoad: true,
|
|
isFinished: true,
|
|
};
|
|
|
|
expect(updateRoll(timers)).toStrictEqual(expected);
|
|
});
|
|
|
|
it('secondary events do not trigger event ends', () => {
|
|
const timers = {
|
|
selectedEventId: null,
|
|
current: null,
|
|
_finishAt: null,
|
|
clock: 16,
|
|
secondaryTimer: 1,
|
|
secondaryTarget: 15,
|
|
};
|
|
|
|
const expected = {
|
|
updatedTimer: null,
|
|
updatedSecondaryTimer: timers.secondaryTarget - timers.clock,
|
|
doRollLoad: true,
|
|
isFinished: false,
|
|
};
|
|
|
|
expect(updateRoll(timers)).toStrictEqual(expected);
|
|
});
|
|
|
|
it('when a secondary timer is finished, it prompts for new event load', () => {
|
|
const timers = {
|
|
selectedEventId: null,
|
|
current: null,
|
|
_finishAt: null,
|
|
clock: 15,
|
|
secondaryTimer: 0,
|
|
secondaryTarget: 15,
|
|
};
|
|
|
|
const expected = {
|
|
updatedTimer: null,
|
|
updatedSecondaryTimer: timers.secondaryTarget - timers.clock,
|
|
doRollLoad: true,
|
|
isFinished: false,
|
|
};
|
|
|
|
expect(updateRoll(timers)).toStrictEqual(expected);
|
|
});
|
|
});
|