V3 (#657)

* refactor: cleanup routes * style: smaller base font * chore: upgrade dependencies * chore: lock node version to electron * refactor: pass HTTP to integration controller (#652) * refactor: deprecate onair control * refactor: remove playback router * Several project files user folder (#617) * chore: automated screenshots (#667) * feat: app settings (#658) * refactor: remove deprecated event data (#674) * Studio clock (#663) --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Feat: reorder events with alt+ctrl + arrow up/down (#645) * Warning and danger per event (#677) --------- Co-authored-by: Fabian Posenau <fabian@fphome.de> * refactor: stabilise actionHandler (#683) Co-authored-by: Fabian Posenau <fabian@fphome.de> * improvement: hide seconds (#675) * wip: overview (#688) * fix: focus cursor (#695) * refactor: update lower third (#665) * Refactor/time formatting (#696) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * feat: multiple selection (#703) --------- Co-authored-by: asharonbaltazar <asharonbaltazar@outlook.com> Co-authored-by: Alex <ac@omnivox.dk> * fix: test - go to `Edit mode` befor tying to click `Event options` button (#708) * refactor: runtime service (#715) * fix: issue with loosing cursor position on message (#719) * remove info panel (#721) * Event editor continue (#722) * update API - part (#709) --------- Co-authored-by: Carlos Valente <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * refactor: update timers (#729) * feat: many timers (#706) --------- Co-authored-by: arc-alex <ac@omnivox.dk> * refactor: excel cleanup (#734) * refactor: allow import of blocks and skip import (#735) * Project manager (#697) * refactor: UI for linking events (#763) * upgraded pipeline actions (#777) * Over under (#771) * custom fields (#744) --------- Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Sheets settings (#774) --------- Co-authored-by: arc-alex <ac@omnivox.dk> * style: tweaks to lower thirds (#785) * refactor: delays account for gaps (#784) * refactor: partial state updates (#780) * feat: generate crash report (#787) * Sheet use limited input device auth flow (#782) --------- Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com> Co-authored-by: Carlos Valente <carlosvalente@pm.me> * Custom fields views (#789) * refactor: deprecate presenter and subtitle (#795) * refactor: organise API around resources (#798) --------- Co-authored-by: Bianca Procopio <biancahprocopio@gmail.com> * Time to end (#804) * Skip fixes (#805) * fix: onair derives from playback * Param nav (#822) --------- Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk> * refactor: download files from interface (#831) * Quick options (#814) * End pause (#832) * chore: bump node version in docker (#834) * refactor: follow in run mode (#840) * fix: uncaught error in http integration (#837) * Apply project (#843) Co-authored-by: Matteo Gheza <matteo.gheza07@gmail.com> Co-authored-by: Ary <arylmoraesn@gmail.com> Co-authored-by: Alex Christoffer Rasmussen <ac@omnivox.dk> Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com> Co-authored-by: Fabian Posenau <fabian@fphome.de> Co-authored-by: Alex Rohleder <alexrohleder96@gmail.com> Co-authored-by: asharonbaltazar <asharonbaltazar@outlook.com> Co-authored-by: Bianca Procopio <biancahprocopio@gmail.com> Co-authored-by: Fabian Posenau <fabianpos99+github@gmail.com>
2026-08-15 12:23:51 +00:00 · 2024-04-13 10:06:46 +02:00
parent debdbd1c5a
commit 55d1aca9b6
640 changed files with 26702 additions and 21623 deletions
@@ -0,0 +1,204 @@
+import { DatabaseModel, OntimeRundown, Settings, URLPreset } from 'ontime-types';
+import { safeMerge } from '../DataProvider.utils.js';
+
+describe('safeMerge', () => {
+  const existing = {
+    rundown: [],
+    project: {
+      title: 'existing title',
+      description: 'existing description',
+      publicUrl: 'existing public URL',
+      backstageUrl: 'existing backstageUrl',
+      publicInfo: 'existing backstageInfo',
+      backstageInfo: 'existing backstageInfo',
+    },
+    settings: {
+      app: 'ontime',
+      version: '2.0.0',
+      serverPort: 4001,
+      editorKey: null,
+      operatorKey: null,
+      timeFormat: '24',
+      language: 'en',
+    },
+    viewSettings: {
+      overrideStyles: false,
+      freezeEnd: false,
+      endMessage: 'existing endMessage',
+      normalColor: '#ffffffcc',
+      warningColor: '#FFAB33',
+      dangerColor: '#ED3333',
+    },
+    urlPresets: [],
+    customFields: {
+      lighting: { type: 'string', label: 'lighting', colour: 'red' },
+      vfx: { type: 'string', label: 'vfx', colour: 'blue' },
+    },
+    osc: {
+      portIn: 8888,
+      portOut: 9999,
+      targetIP: '127.0.0.1',
+      enabledIn: false,
+      enabledOut: false,
+      subscriptions: [],
+    },
+    http: {
+      enabledOut: false,
+      subscriptions: [],
+    },
+  } as DatabaseModel;
+
+  it('returns existing data if new data is not provided', () => {
+    const mergedData = safeMerge(existing, undefined);
+    expect(mergedData).toEqual(existing);
+  });
+
+  it('merges the rundown key', () => {
+    const newData = {
+      rundown: [{ title: 'item 1' }, { title: 'item 2' }] as OntimeRundown,
+    };
+    const mergedData = safeMerge(existing, newData);
+    expect(mergedData.rundown).toEqual(newData.rundown);
+  });
+
+  it('merges the project key', () => {
+    const newData = {
+      project: {
+        title: 'new title',
+        publicInfo: 'new public info',
+      },
+    };
+    // @ts-expect-error -- just testing
+    const mergedData = safeMerge(existing, newData);
+    expect(mergedData.project).toEqual({
+      title: 'new title',
+      description: 'existing description',
+      publicUrl: 'existing public URL',
+      publicInfo: 'new public info',
+      backstageUrl: 'existing backstageUrl',
+      backstageInfo: 'existing backstageInfo',
+    });
+  });
+
+  it('merges the settings key', () => {
+    const newData = {
+      settings: {
+        serverPort: 3000,
+        language: 'pt',
+      } as Settings,
+    };
+    const mergedData = safeMerge(existing, newData);
+    expect(mergedData.settings).toEqual({
+      app: 'ontime',
+      version: '2.0.0',
+      serverPort: 3000,
+      operatorKey: null,
+      editorKey: null,
+      timeFormat: '24',
+      language: 'pt',
+    });
+  });
+  it('merges the osc key', () => {
+    const newData = {
+      osc: {
+        portIn: 7777,
+        subscriptions: [
+          {
+            id: 'unique',
+            cycle: 'onStart',
+            message: 'new message',
+            enabled: true,
+          },
+        ],
+      },
+    };
+    //@ts-expect-error -- testing partial merge
+    const mergedData = safeMerge(existing, newData);
+    expect(mergedData.osc).toMatchObject({
+      portIn: 7777,
+      portOut: 9999,
+      targetIP: '127.0.0.1',
+      enabledIn: false,
+      enabledOut: false,
+      subscriptions: [
+        {
+          id: 'unique',
+          cycle: 'onStart',
+          message: 'new message',
+          enabled: true,
+        },
+      ],
+    });
+  });
+
+  it('should merge the urlPresets key when present', () => {
+    const existingData = {
+      rundown: [],
+      project: {
+        title: '',
+        publicUrl: '',
+        publicInfo: '',
+        backstageUrl: '',
+        backstageInfo: '',
+      },
+      settings: {
+        app: 'ontime',
+        version: '2.0.0',
+        serverPort: 4001,
+        operatorKey: null,
+        editorKey: null,
+        timeFormat: '24',
+        language: 'en',
+      },
+      viewSettings: {
+        overrideStyles: false,
+        endMessage: '',
+      },
+      urlPresets: [],
+      osc: {
+        portIn: 8888,
+        portOut: 9999,
+        targetIP: '127.0.0.1',
+        enabledIn: false,
+        enabledOut: false,
+        subscriptions: [],
+      },
+    } as DatabaseModel;
+
+    const newData = {
+      urlPresets: [
+        { enabled: true, alias: 'alias1', pathAndParams: '' },
+        { enabled: true, alias: 'alias2', pathAndParams: '' },
+      ] as URLPreset[],
+    };
+
+    const mergedData = safeMerge(existingData, newData);
+
+    expect(mergedData.urlPresets).toEqual(newData.urlPresets);
+  });
+
+  it('merges customFields into existing object', () => {
+    const existing = {
+      customFields: {
+        lighting: { type: 'string', label: 'lighting' },
+        sound: { type: 'string', label: 'sound' },
+      },
+    };
+
+    const newData = {
+      customFields: {
+        switcher: { type: 'string', label: 'switcher' },
+        vfx: { type: 'string', label: 'vfx' },
+      },
+    };
+
+    const expected = {
+      switcher: { type: 'string', label: 'switcher' },
+      vfx: { type: 'string', label: 'vfx' },
+    };
+
+    //@ts-expect-error -- testing partial merge
+    const result = safeMerge(existing, newData);
+    expect(result.customFields).toEqual(expected);
+  });
+});