diff --git a/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx b/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx index d224710f5..043b99d48 100644 --- a/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx +++ b/apps/client/src/features/rundown/entry-editor/BlockEditor.tsx @@ -6,7 +6,6 @@ import * as Editor from '../../../common/components/editor-utils/EditorUtils'; import SwatchSelect from '../../../common/components/input/colour-input/SwatchSelect'; import NullableTimeInput from '../../../common/components/input/time-input/NullableTimeInput'; import AppLink from '../../../common/components/link/app-link/AppLink'; -import Switch from '../../../common/components/switch/Switch'; import { useEntryActions } from '../../../common/hooks/useEntryAction'; import useCustomFields from '../../../common/hooks-query/useCustomFields'; import { enDash, timerPlaceholder } from '../../../common/utils/styleUtils'; @@ -21,7 +20,6 @@ import style from './EntryEditor.module.scss'; // title + colour + custom field labels export type BlockEditorUpdateTextFields = 'targetDuration' | 'title' | 'colour' | string; export type BlockEditorUpdateMaybeNumberFields = 'targetDuration'; -export type BlockEditorBooleanFields = 'isNextDay'; interface BlockEditorProps { block: OntimeBlock; @@ -32,10 +30,7 @@ export default function BlockEditor({ block }: BlockEditorProps) { const { updateEntry } = useEntryActions(); const handleSubmit = useCallback( - ( - field: BlockEditorUpdateTextFields | BlockEditorUpdateMaybeNumberFields | BlockEditorBooleanFields, - value: string | boolean, - ) => { + (field: BlockEditorUpdateTextFields | BlockEditorUpdateMaybeNumberFields, value: string | boolean) => { // Handle custom fields if (typeof field === 'string' && field.startsWith('custom-')) { const fieldLabel = field.split('custom-')[1]; @@ -51,10 +46,6 @@ export default function BlockEditor({ block }: BlockEditorProps) { return updateEntry({ id: block.id, targetDuration: parseUserTime(value as string) }); } - if (field === 'isNextDay') { - return updateEntry({ id: block.id, isNextDay: value as boolean }); - } - // all other strings are text fields return updateEntry({ id: block.id, [field]: value as string }); }, @@ -112,18 +103,6 @@ export default function BlockEditor({ block }: BlockEditorProps) { -
- Is next day? - - { - handleSubmit('isNextDay', checked); - }} - /> - {block.isNextDay ? 'Events start the day after' : '-'} - -
diff --git a/apps/server/src/api-data/rundown/rundown.utils.ts b/apps/server/src/api-data/rundown/rundown.utils.ts index e4695286f..9afb22694 100644 --- a/apps/server/src/api-data/rundown/rundown.utils.ts +++ b/apps/server/src/api-data/rundown/rundown.utils.ts @@ -135,7 +135,6 @@ export function createBlockPatch(originalBlock: OntimeBlock, patchBlock: Partial title: makeString(patchBlock.title, originalBlock.title), note: makeString(patchBlock.note, originalBlock.note), entries: patchBlock.entries ?? originalBlock.entries, - isNextDay: typeof patchBlock.isNextDay === 'boolean' ? patchBlock.isNextDay : originalBlock.isNextDay, targetDuration: maybeTargetDuration(), colour: makeString(patchBlock.colour, originalBlock.colour), revision: originalBlock.revision, @@ -231,7 +230,6 @@ export function createBlock(patch?: Partial): OntimeBlock { title: patch.title ?? '', note: patch.note ?? '', entries: patch.entries ?? [], - isNextDay: patch.isNextDay ?? false, targetDuration: patch.targetDuration ?? null, colour: makeString(patch.colour, ''), custom: patch.custom ?? {}, diff --git a/apps/server/src/models/demoProject.ts b/apps/server/src/models/demoProject.ts index cc6675edd..ea4867fda 100644 --- a/apps/server/src/models/demoProject.ts +++ b/apps/server/src/models/demoProject.ts @@ -45,7 +45,6 @@ export const demoDb: DatabaseModel = { id: 'block', title: 'Test Block', note: '', - isNextDay: false, targetDuration: null, colour: 'hotpink', revision: 0, @@ -212,7 +211,6 @@ export const demoDb: DatabaseModel = { note: '', colour: '', entries: [], - isNextDay: false, targetDuration: null, custom: {}, revision: 0, @@ -375,7 +373,6 @@ export const demoDb: DatabaseModel = { note: '', colour: '', entries: [], - isNextDay: false, targetDuration: null, custom: {}, revision: 0, diff --git a/apps/server/src/models/eventsDefinition.ts b/apps/server/src/models/eventsDefinition.ts index f03cfdb22..877a9fd87 100644 --- a/apps/server/src/models/eventsDefinition.ts +++ b/apps/server/src/models/eventsDefinition.ts @@ -58,7 +58,6 @@ export const block: Omit = { title: '', note: '', entries: [], - isNextDay: false, targetDuration: null, colour: '', custom: {}, diff --git a/packages/types/src/definitions/core/OntimeEntry.ts b/packages/types/src/definitions/core/OntimeEntry.ts index d008184dc..b462ea7d5 100644 --- a/packages/types/src/definitions/core/OntimeEntry.ts +++ b/packages/types/src/definitions/core/OntimeEntry.ts @@ -37,7 +37,6 @@ export type OntimeBlock = OntimeBaseEvent & { title: string; note: string; entries: EntryId[]; - isNextDay: boolean; targetDuration: MaybeNumber; colour: string; custom: EntryCustomFields;