refactor: improve handling of multi-fields

apps/client/src/views/backstage/backstage.options.ts

@@ -2,12 +2,10 @@ import { useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { CustomFields, OntimeEvent } from 'ontime-types';
 
-import {
-  getTimeOption,
-  makeOptionsFromCustomFields,
-  OptionTitle,
-} from '../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../common/components/view-params-editor/types';
+import { getTimeOption } from '../../common/components/view-params-editor/common.options';
+import { OptionTitle } from '../../common/components/view-params-editor/constants';
+import { ViewOption } from '../../common/components/view-params-editor/viewParams.types';
+import { makeOptionsFromCustomFields } from '../../common/components/view-params-editor/viewParams.utils';
 import { scheduleOptions } from '../common/schedule/schedule.options';
 
 export const getBackstageOptions = (timeFormat: string, customFields: CustomFields): ViewOption[] => {

apps/client/src/views/common/schedule/schedule.options.ts

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import { OptionTitle } from '../../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../../common/components/view-params-editor/types';
+import { ViewOption } from '../../../common/components/view-params-editor/viewParams.types';
 import { isStringBoolean } from '../../../features/viewers/common/viewUtils';
 
 export const scheduleOptions: ViewOption = {

apps/client/src/views/countdown/Countdown.tsx

@@ -63,7 +63,7 @@ export default function Countdown({
 
   // gather option data
   const defaultFormat = getDefaultFormat(settings?.timeFormat);
-  const countdownOptions = getCountdownOptions(defaultFormat, customFields);
+  const countdownOptions = getCountdownOptions(defaultFormat, customFields, subscriptions);
 
   return (
     <div className={`countdown ${isMirrored ? 'mirror' : ''}`} data-testid='countdown-view'>

apps/client/src/views/countdown/countdown.options.ts

@@ -2,15 +2,17 @@ import { useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import { CustomFields, EntryId, OntimeEvent } from 'ontime-types';
 
-import {
-  getTimeOption,
-  makeOptionsFromCustomFields,
-  OptionTitle,
-} from '../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../common/components/view-params-editor/types';
+import { getTimeOption } from '../../common/components/view-params-editor/common.options';
+import { OptionTitle } from '../../common/components/view-params-editor/constants';
+import { ViewOption } from '../../common/components/view-params-editor/viewParams.types';
+import { makeOptionsFromCustomFields } from '../../common/components/view-params-editor/viewParams.utils';
 import { isStringBoolean } from '../../features/viewers/common/viewUtils';
 
-export const getCountdownOptions = (timeFormat: string, customFields: CustomFields): ViewOption[] => {
+export const getCountdownOptions = (
+  timeFormat: string,
+  customFields: CustomFields,
+  persistedSubscriptions: EntryId[],
+): ViewOption[] => {
   const secondaryOptions = makeOptionsFromCustomFields(customFields, { note: 'Note' });
 
   return [
@@ -20,15 +22,6 @@ export const getCountdownOptions = (timeFormat: string, customFields: CustomFiel
       collapsible: true,
       options: [
         {
-          id: 'sub',
-          title: 'Event subscription',
-          description: 'The events to follow',
-          value: '',
-          type: 'persist',
-        },
-        {
-          // TODO: adding a secondary source is removing the subscriptions
-          // this seems to be a bug with persist assuming that the property has a single entry
           id: 'secondary-src',
           title: 'Event secondary text',
           description: 'Select the data source for auxiliary text shown in the card',
@@ -51,6 +44,18 @@ export const getCountdownOptions = (timeFormat: string, customFields: CustomFiel
         },
       ],
     },
+    {
+      title: OptionTitle.Hidden,
+      options: [
+        {
+          id: 'sub',
+          title: 'Event subscription',
+          description: 'The events to follow',
+          values: persistedSubscriptions,
+          type: 'persist',
+        },
+      ],
+    },
   ];
 };
 

apps/client/src/views/cuesheet/cuesheet.options.ts

@@ -2,7 +2,7 @@ import { useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 
 import { OptionTitle } from '../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../common/components/view-params-editor/types';
+import { ViewOption } from '../../common/components/view-params-editor/viewParams.types';
 import { isStringBoolean } from '../../features/viewers/common/viewUtils';
 
 /**

apps/client/src/views/project-info/projectInfo.options.ts

@@ -1,5 +1,5 @@
 import { OptionTitle } from '../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../common/components/view-params-editor/types';
+import { ViewOption } from '../../common/components/view-params-editor/viewParams.types';
 
 export const projectInfoOptions: ViewOption[] = [
   {

apps/client/src/views/timeline/timeline.options.ts

@@ -1,5 +1,6 @@
-import { getTimeOption, OptionTitle } from '../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../common/components/view-params-editor/types';
+import { getTimeOption } from '../../common/components/view-params-editor/common.options';
+import { OptionTitle } from '../../common/components/view-params-editor/constants';
+import { ViewOption } from '../../common/components/view-params-editor/viewParams.types';
 
 export const getTimelineOptions = (timeFormat: string): ViewOption[] => {
   return [

apps/client/src/views/timer/timer.options.ts

@@ -6,11 +6,11 @@ import { validateTimerType } from 'ontime-utils';
 import {
   getTimeOption,
   hideTimerSeconds,
-  makeOptionsFromCustomFields,
-  OptionTitle,
   showLeadingZeros,
-} from '../../common/components/view-params-editor/constants';
-import { ViewOption } from '../../common/components/view-params-editor/types';
+} from '../../common/components/view-params-editor/common.options';
+import { OptionTitle } from '../../common/components/view-params-editor/constants';
+import { ViewOption } from '../../common/components/view-params-editor/viewParams.types';
+import { makeOptionsFromCustomFields } from '../../common/components/view-params-editor/viewParams.utils';
 import { isStringBoolean } from '../../features/viewers/common/viewUtils';
 
 // manually match the properties of TimerType excluding the None