refactor: remove userFields (#791)

* refactor: process custom fields on cache generate

* refactor: remove userFields

apps/server/src/classes/data-provider/DataProvider.ts

@@ -8,7 +8,6 @@ import {
   ViewSettings,
   DatabaseModel,
   OSCSettings,
-  UserFields,
   Alias,
   Settings,
   CustomFields,
@@ -75,10 +74,6 @@ export class DataProvider {
     await this.persist();
   }
 
-  static getUserFields() {
-    return { ...data.userFields };
-  }
-
   static getViewSettings() {
     return { ...data.viewSettings };
   }
@@ -88,11 +83,6 @@ export class DataProvider {
     await this.persist();
   }
 
-  static async setUserFields(newData: UserFields) {
-    data.userFields = { ...newData };
-    await this.persist();
-  }
-
   static async setOsc(newData: OSCSettings): Promise<OSCSettings> {
     data.osc = { ...newData };
     await this.persist();
@@ -124,7 +114,6 @@ export class DataProvider {
     data.osc = mergedData.osc;
     data.http = mergedData.http;
     data.aliases = mergedData.aliases;
-    data.userFields = mergedData.userFields;
     data.customFields = mergedData.customFields;
     data.rundown = mergedData.rundown;
     await this.persist();

apps/server/src/classes/data-provider/DataProvider.utils.ts

@@ -6,7 +6,7 @@ import { DatabaseModel } from 'ontime-types';
  * @param {object} newData
  */
 export function safeMerge(existing: DatabaseModel, newData: Partial<DatabaseModel>) {
-  const { rundown, project, settings, viewSettings, aliases, customFields, userFields, osc, http } = newData || {};
+  const { rundown, project, settings, viewSettings, aliases, customFields, osc, http } = newData || {};
 
   return {
     ...existing,
@@ -16,10 +16,6 @@ export function safeMerge(existing: DatabaseModel, newData: Partial<DatabaseMode
     viewSettings: { ...existing.viewSettings, ...viewSettings },
     aliases: aliases ?? existing.aliases,
     customFields: customFields ?? existing.customFields,
-    userFields: {
-      ...existing.userFields,
-      ...(userFields && Object.fromEntries(Object.entries(userFields).filter(([_, value]) => value !== null))),
-    },
     osc: { ...existing.osc, ...osc },
     http: { ...existing.http, ...http },
   };

apps/server/src/classes/data-provider/__tests__/DataProvider.test.ts

@@ -29,18 +29,6 @@ describe('safeMerge', () => {
       dangerColor: '#ED3333',
     },
     aliases: [],
-    userFields: {
-      user0: 'existing user0',
-      user1: 'existing user1',
-      user2: 'existing user2',
-      user3: 'existing user3',
-      user4: 'existing user4',
-      user5: 'existing user5',
-      user6: 'existing user6',
-      user7: 'existing user7',
-      user8: 'existing user8',
-      user9: 'existing user9',
-    },
     customFields: {
       lighting: { type: 'string', label: 'lighting', colour: 'red' },
       vfx: { type: 'string', label: 'vfx', colour: 'blue' },
@@ -166,18 +154,6 @@ describe('safeMerge', () => {
         endMessage: '',
       },
       aliases: [],
-      userFields: {
-        user0: 'user0',
-        user1: 'user1',
-        user2: 'user2',
-        user3: 'user3',
-        user4: 'user4',
-        user5: 'user5',
-        user6: 'user6',
-        user7: 'user7',
-        user8: 'user8',
-        user9: 'user9',
-      },
       osc: {
         portIn: 8888,
         portOut: 9999,
@@ -200,34 +176,6 @@ describe('safeMerge', () => {
     expect(mergedData.aliases).toEqual(newData.aliases);
   });
 
-  it('merges userFields into existing object', () => {
-    const existing = {
-      userFields: {
-        user0: 'Alice',
-        user1: 'Bob',
-      },
-    };
-
-    const newData = {
-      userFields: {
-        user2: 'Charlie',
-        user3: 'David',
-        user4: null,
-      },
-    };
-
-    const expected = {
-      user0: 'Alice',
-      user1: 'Bob',
-      user2: 'Charlie',
-      user3: 'David',
-    };
-
-    //@ts-expect-error -- testing partial merge
-    const result = safeMerge(existing, newData);
-    expect(result.userFields).toEqual(expected);
-  });
-
   it('merges customFields into existing object', () => {
     const existing = {
       customFields: {