refactor: deprecate presenter and subtitle (#795)

* refactor: deprecate presenter and subtitle

* style: reduce spacing between related sections

* refactor: optional secondary field

* refactor: remove secondary field

* refactor: dynamic data source

apps/client/src/features/cuesheet/__tests__/__snapshots__/utils.test.js.snap

@@ -19,8 +19,6 @@ exports[`makeTable() > returns array of arrays with given fields 1`] = `
     "Colour",
     "Cue",
     "Title",
-    "Subtitle",
-    "Presenter",
     "Note",
     "Is Public? (x)",
     "Skip?",
@@ -35,8 +33,6 @@ exports[`makeTable() > returns array of arrays with given fields 1`] = `
     "",
     "test title 1",
     "",
-    "",
-    "",
     "x",
     "",
     "",

apps/client/src/features/cuesheet/__tests__/utils.test.js

@@ -27,15 +27,13 @@ describe('parseField()', () => {
   });
 
   it('returns an empty string on undefined fields', () => {
-    expect(parseField('presenter')).toBe('');
+    expect(parseField('title')).toBe('');
   });
 
   describe('simply returns any other value in any other field', () => {
     const testFields = [
       { field: 'nothing', value: '123' },
       { field: 'title', value: 'test' },
-      { field: 'presenter', value: 'test' },
-      { field: 'subtitle', value: 'test' },
       { field: 'note', value: 'test' },
       { field: 'colour', value: 'test' },
     ];
@@ -57,7 +55,6 @@ describe('makeTable()', () => {
     const tableData = [
       {
         title: 'test title 1',
-        presenter: '',
         timeStart: 0,
         timeEnd: 0,
         isPublic: 'x',

apps/client/src/features/cuesheet/cuesheetCols.tsx

@@ -61,6 +61,7 @@ export function makeCuesheetColumns(customFields: CustomFields): ColumnDef<Ontim
     header: customFields[key].label,
     meta: { colour: customFields[key].colour },
     cell: MakeCustomField,
+    size: 250,
   }));
 
   return [
@@ -104,24 +105,14 @@ export function makeCuesheetColumns(customFields: CustomFields): ColumnDef<Ontim
       id: 'title',
       header: 'Title',
       cell: (row) => row.getValue(),
-    },
-    {
-      accessorKey: 'subtitle',
-      id: 'subtitle',
-      header: 'Subtitle',
-      cell: (row) => row.getValue(),
-    },
-    {
-      accessorKey: 'presenter',
-      id: 'presenter',
-      header: 'Presenter',
-      cell: (row) => row.getValue(),
+      size: 250,
     },
     {
       accessorKey: 'note',
       id: 'note',
       header: 'Note',
       cell: (row) => row.getValue(),
+      size: 250,
     },
     ...dynamicCustomFields,
   ];

apps/client/src/features/cuesheet/cuesheetUtils.ts

@@ -56,8 +56,6 @@ export const makeTable = (headerData: ProjectData, rundown: OntimeRundown, custo
     'colour',
     'cue',
     'title',
-    'subtitle',
-    'presenter',
     'note',
     'isPublic',
     'skip',
@@ -72,8 +70,6 @@ export const makeTable = (headerData: ProjectData, rundown: OntimeRundown, custo
     'Colour',
     'Cue',
     'Title',
-    'Subtitle',
-    'Presenter',
     'Note',
     'Is Public? (x)',
     'Skip?',

apps/client/src/features/cuesheet/defaults.ts

@@ -10,8 +10,6 @@ export const defaultColumnOrder: OntimeEntryCommonKeys[] = [
   'timeEnd',
   'duration',
   'title',
-  'subtitle',
-  'presenter',
   'note',
 ];