dont save

This commit is contained in:
arc-alex
2023-12-16 23:56:15 +01:00
parent 2464ac1bd9
commit 8fa7392698
11 changed files with 18 additions and 125 deletions
@@ -11,7 +11,6 @@ import {
UserFields,
Alias,
Settings,
Sheet,
} from 'ontime-types';
import { data, db } from '../../modules/loadDb.js';
@@ -59,15 +58,6 @@ export class DataProvider {
await this.persist();
}
static getSheet() {
return data.sheet;
}
static async setSheet(newData: Sheet) {
data.sheet = { ...newData };
await this.persist();
}
static getOsc() {
return data.osc;
}
@@ -6,13 +6,12 @@ import { DatabaseModel } from 'ontime-types';
* @param {object} newData
*/
export function safeMerge(existing: DatabaseModel, newData: Partial<DatabaseModel>) {
const { rundown, project, settings, sheet, viewSettings, osc, aliases, userFields } = newData || {};
const { rundown, project, settings, viewSettings, osc, aliases, userFields } = newData || {};
return {
...existing,
rundown: rundown ?? existing.rundown,
project: { ...existing.project, ...project },
settings: { ...existing.settings, ...settings },
sheet: { ...existing.sheet, ...sheet },
viewSettings: { ...existing.viewSettings, ...viewSettings },
aliases: aliases ?? existing.aliases,
userFields: {
@@ -1,4 +1,4 @@
import { Alias, DatabaseModel, Sheet, OntimeRundown, Settings } from 'ontime-types';
import { Alias, DatabaseModel, OntimeRundown, Settings } from 'ontime-types';
import { safeMerge } from '../DataProvider.utils.js';
describe('safeMerge', () => {
@@ -21,10 +21,6 @@ describe('safeMerge', () => {
timeFormat: '24',
language: 'en',
},
sheet: {
worksheet: '1',
id: '2',
},
viewSettings: {
overrideStyles: false,
endMessage: 'existing endMessage',
@@ -101,21 +97,6 @@ describe('safeMerge', () => {
language: 'pt',
});
});
it('merges the sheet key', () => {
const newData = {
sheet: {
id: '4',
worksheet: '5',
} as Sheet,
};
const mergedData = safeMerge(existing, newData);
expect(mergedData.sheet).toEqual({
id: '4',
worksheet: '5',
});
});
it('merges the osc key', () => {
const newData = {
osc: {