Deprecation: Remove segmenttiming and break properties

meteor/server/api/rest/v1/ingest.ts

@@ -164,6 +164,8 @@ class IngestServerAPI implements IngestRestAPI {
 			playlistExternalId: rawRundown.playlistExternalId,
 			studioId: unprotectString(rawRundown.studioId),
 			name: rawRundown.name,
+			type: rawRundown.source.type,
+			timing: rawRundown.timing,
 		}
 	}
 
@@ -175,6 +177,12 @@ class IngestServerAPI implements IngestRestAPI {
 			rank: rawSegment._rank,
 			rundownId: unprotectString(rawSegment.rundownId),
 			isHidden: rawSegment.isHidden,
+			timing: rawSegment.segmentTiming
+				? {
+						budgetDuration: rawSegment.segmentTiming.budgetDuration,
+						countdownType: rawSegment.segmentTiming.countdownType,
+					}
+				: undefined,
 		}
 	}
 

meteor/server/lib/rest/v1/ingest.ts

@@ -250,6 +250,13 @@ export type RundownResponse = {
 	playlistId: string
 	playlistExternalId?: string
 	name: string
+	type?: string
+	timing?: {
+		type: string
+		expectedStart?: number
+		expectedDuration?: number
+		expectedEnd?: number
+	}
 }
 
 export type SegmentResponse = {
@@ -259,6 +266,10 @@ export type SegmentResponse = {
 	name: string
 	rank: number
 	isHidden?: boolean
+	timing?: {
+		budgetDuration?: number
+		countdownType?: string
+	}
 }
 
 export type PartResponse = {

packages/blueprints-integration/src/documents/rundown.ts

@@ -22,12 +22,6 @@ export interface IBlueprintRundown<TPrivateData = unknown, TPublicData = unknown
 	/** A hint to the Core that the Rundown should be a part of a playlist */
 	playlistExternalId?: string
 
-	/**
-	 * Whether the end of the rundown marks a break in the show.
-	 * Allows the Next Break timer in the Rundown Header to time to the end of this rundown when looking for the next break.
-	 */
-	endOfRundownIsShowBreak?: boolean
-
 	/**
 	 * User editing definitions for this rundown
 	 */

packages/blueprints-integration/src/documents/segment.ts

@@ -15,12 +15,6 @@ export enum CountdownType {
 }
 
 export interface SegmentTimingInfo {
-	/** A unix timestamp of when the segment is expected to begin. Affects rundown timing. */
-	expectedStart?: number
-
-	/** A unix timestamp of when the segment is expected to end. Affects rundown timing. */
-	expectedEnd?: number
-
 	/** Budget duration of this segment, in milliseconds */
 	budgetDuration?: number
 

packages/corelib/src/dataModel/Rundown.ts

@@ -74,8 +74,6 @@ export interface Rundown {
 
 	/** External id of the Rundown Playlist to put this rundown in */
 	playlistExternalId?: string
-	/** Whether the end of the rundown marks a commercial break */
-	endOfRundownIsShowBreak?: boolean
 	/** The id of the Rundown Playlist this rundown is in */
 	playlistId: RundownPlaylistId
 	/** If the playlistId has ben set manually by a user in Sofie */

packages/job-worker/src/blueprints/context/lib.ts

@@ -426,7 +426,6 @@ export function convertRundownToBlueprints(rundown: ReadonlyDeep<DBRundown>): IB
 		privateData: clone(rundown.privateData),
 		publicData: clone(rundown.publicData),
 		playlistExternalId: rundown.playlistExternalId,
-		endOfRundownIsShowBreak: rundown.endOfRundownIsShowBreak,
 		_id: unprotectString(rundown._id),
 		showStyleVariantId: unprotectString(rundown.showStyleVariantId),
 		playlistId: unprotectString(rundown.playlistId),

packages/meteor-lib/src/collections/RundownLayouts.ts

@@ -44,7 +44,6 @@ export enum RundownLayoutElementType {
 	NEXT_INFO = 'next_info',
 	PLAYLIST_START_TIMER = 'playlist_start_timer',
 	PLAYLIST_END_TIMER = 'playlist_end_timer',
-	NEXT_BREAK_TIMING = 'next_break_timing',
 	SEGMENT_TIMING = 'segment_timing',
 	PART_TIMING = 'part_timing',
 	TEXT_LABEL = 'text_label',
@@ -146,10 +145,6 @@ export interface RundownLayoutPlaylistEndTimer extends RundownLayoutElementBase
 	hidePlannedEnd: boolean
 }
 
-export interface RundownLayoutNextBreakTiming extends RundownLayoutElementBase {
-	type: RundownLayoutElementType.NEXT_BREAK_TIMING
-}
-
 export interface RundownLayoutSegmentTiming extends RundownLayoutElementBase, RequiresActiveLayers {
 	type: RundownLayoutElementType.SEGMENT_TIMING
 	timingType: 'count_down' | 'count_up'
@@ -267,7 +262,6 @@ export type DashboardLayoutAdLibRegion = DashboardPanel<RundownLayoutAdLibRegion
 export type DashboardLayoutPieceCountdown = DashboardPanel<RundownLayoutPieceCountdown>
 export type DashboardLayoutNextInfo = DashboardPanel<RundownLayoutNextInfo>
 export type DashboardLayoutPlaylistStartTimer = DashboardPanel<RundownLayoutPlaylistStartTimer>
-export type DashboardLayoutNextBreakTiming = DashboardPanel<RundownLayoutNextBreakTiming>
 export type DashboardLayoutPlaylistEndTimer = DashboardPanel<RundownLayoutPlaylistEndTimer>
 export type DashboardLayoutSegmentCountDown = DashboardPanel<RundownLayoutSegmentTiming>
 export type DashboardLayoutPartCountDown = DashboardPanel<RundownLayoutPartTiming>
@@ -331,8 +325,6 @@ export interface RundownViewLayout extends RundownLayoutBase {
 	liveLineProps?: RequiresActiveLayers
 	/** Hide the rundown divider header in playlists */
 	hideRundownDivider: boolean
-	/** Show breaks in segment timeline list */
-	showBreaksAsSegments: boolean
 	/** Only count down to the segment if it contains pieces on these layers */
 	countdownToSegmentRequireLayers: string[]
 	/** Always show planned segment duration instead of counting up/down when the segment is live */

packages/openapi/api/definitions/ingest.yaml

@@ -1238,12 +1238,12 @@ components:
         timing:
           type: object
           properties:
-            expectedStart:
-              type: number
-              description: Epoch timestamp in milliseconds.
-            expectedEnd:
+            budgetDuration:
               type: number
-              description: Epoch timestamp in milliseconds.
+              description: Budget duration of this segment, in milliseconds
+            countdownType:
+              type: string
+              description: Defines the behavior of countdowns during this segment.
           additionalProperties: false
       required:
         - id

packages/openapi/src/__tests__/ingest.spec.ts

@@ -198,8 +198,8 @@ describe('Ingest API', () => {
 			expect(typeof segment.name).toBe('string')
 			expect(typeof segment.rank).toBe('number')
 			expect(typeof segment.timing).toBe('object')
-			expect(typeof segment.timing.expectedStart).toBe('number')
-			expect(typeof segment.timing.expectedEnd).toBe('number')
+			expect(['number', 'undefined']).toContain(typeof segment.timing?.budgetDuration)
+			expect(['string', 'undefined']).toContain(typeof segment.timing?.countdownType)
 			segmentIds.push(segment.externalId)
 		})
 	})
@@ -218,16 +218,14 @@ describe('Ingest API', () => {
 		expect(segment).toHaveProperty('name')
 		expect(segment).toHaveProperty('rank')
 		expect(segment).toHaveProperty('timing')
-		expect(segment.timing).toHaveProperty('expectedStart')
-		expect(segment.timing).toHaveProperty('expectedEnd')
 		expect(typeof segment.id).toBe('string')
 		expect(typeof segment.externalId).toBe('string')
 		expect(typeof segment.rundownId).toBe('string')
 		expect(typeof segment.name).toBe('string')
 		expect(typeof segment.rank).toBe('number')
 		expect(typeof segment.timing).toBe('object')
-		expect(typeof segment.timing.expectedStart).toBe('number')
-		expect(typeof segment.timing.expectedEnd).toBe('number')
+		expect(['number', 'undefined']).toContain(typeof segment.timing?.budgetDuration)
+		expect(['string', 'undefined']).toContain(typeof segment.timing?.countdownType)
 	})
 
 	const segment = {

packages/openapi/src/generated/openapi.yaml

@@ -6725,12 +6725,12 @@ paths:
                     timing:
                       type: object
                       properties:
-                        expectedStart:
-                          type: number
-                          description: Epoch timestamp in milliseconds.
-                        expectedEnd:
+                        budgetDuration:
                           type: number
-                          description: Epoch timestamp in milliseconds.
+                          description: Budget duration of this segment, in milliseconds
+                        countdownType:
+                          type: string
+                          description: Defines the behavior of countdowns during this segment.
                       additionalProperties: false
                   required:
                     - id
@@ -7061,12 +7061,12 @@ paths:
                   timing:
                     type: object
                     properties:
-                      expectedStart:
-                        type: number
-                        description: Epoch timestamp in milliseconds.
-                      expectedEnd:
+                      budgetDuration:
                         type: number
-                        description: Epoch timestamp in milliseconds.
+                        description: Budget duration of this segment, in milliseconds
+                      countdownType:
+                        type: string
+                        description: Defines the behavior of countdowns during this segment.
                     additionalProperties: false
                 required:
                   - id