wip

Author: Julusian

packages/corelib/src/playout/infinites.ts

@@ -204,6 +204,7 @@ export function getPlayheadTrackingInfinitesForPart(
 						case PieceLifespan.OutOnSegmentEnd:
 							isValid =
 								currentPartInstance.segmentId === intoPart.segmentId &&
+								!!candidatePiece.piece.startPartId &&
 								partsToReceiveOnSegmentEndFromSet.has(candidatePiece.piece.startPartId)
 							break
 						case PieceLifespan.OutOnRundownEnd:
@@ -294,11 +295,16 @@ export function isPiecePotentiallyActiveInPart(
 			return false
 		case PieceLifespan.OutOnSegmentEnd:
 			return (
+				!!pieceToCheck.startPartId &&
 				pieceToCheck.startSegmentId === part.segmentId &&
 				partsToReceiveOnSegmentEndFrom.has(pieceToCheck.startPartId)
 			)
 		case PieceLifespan.OutOnRundownEnd:
-			if (pieceToCheck.startRundownId === part.rundownId) {
+			if (
+				pieceToCheck.startRundownId === part.rundownId &&
+				pieceToCheck.startPartId &&
+				pieceToCheck.startSegmentId
+			) {
 				if (pieceToCheck.startSegmentId === part.segmentId) {
 					return partsToReceiveOnSegmentEndFrom.has(pieceToCheck.startPartId)
 				} else {
@@ -315,6 +321,7 @@ export function isPiecePotentiallyActiveInPart(
 			} else {
 				// Predicting what will happen at arbitrary point in the future
 				return (
+					!!pieceToCheck.startPartId &&
 					pieceToCheck.startSegmentId === part.segmentId &&
 					partsToReceiveOnSegmentEndFrom.has(pieceToCheck.startPartId)
 				)
@@ -327,6 +334,7 @@ export function isPiecePotentiallyActiveInPart(
 			} else {
 				// Predicting what will happen at arbitrary point in the future
 				return (
+					!!pieceToCheck.startSegmentId &&
 					pieceToCheck.startRundownId === part.rundownId &&
 					segmentsToReceiveOnRundownEndFrom.has(pieceToCheck.startSegmentId)
 				)
@@ -389,8 +397,8 @@ export function getPieceInstancesForPart(
 		if (pieceA.startPartId === pieceB.startPartId) {
 			return pieceA.enable.start < pieceB.enable.start
 		}
-		const pieceAIndex = orderedPartIds.indexOf(pieceA.startPartId)
-		const pieceBIndex = orderedPartIds.indexOf(pieceB.startPartId)
+		const pieceAIndex = pieceA.startPartId === null ? -2 : orderedPartIds.indexOf(pieceA.startPartId)
+		const pieceBIndex = pieceB.startPartId === null ? -2 : orderedPartIds.indexOf(pieceB.startPartId)
 
 		if (pieceAIndex === -1) {
 			return false

packages/webui/src/client/lib/RundownResolver.ts

@@ -62,7 +62,7 @@ function fetchPiecesThatMayBeActiveForPart(
 	segmentsToReceiveOnRundownEndFromSet: Set<SegmentId>,
 	rundownsToReceiveOnShowStyleEndFrom: RundownId[],
 	/** Map of Pieces on Parts, passed through for performance */
-	allPiecesCache?: Map<PartId, Piece[]>
+	allPiecesCache?: Map<PartId | null, Piece[]>
 ): Piece[] {
 	let piecesStartingInPart: Piece[]
 	const allPieces = allPiecesCache?.get(part._id)
@@ -129,7 +129,7 @@ export function getPieceInstancesForPartInstance(
 	currentSegment: Pick<DBSegment, '_id' | 'orphaned'> | undefined,
 	currentPartInstancePieceInstances: PieceInstance[] | undefined,
 	/** Map of Pieces on Parts, passed through for performance */
-	allPiecesCache?: Map<PartId, Piece[]>,
+	allPiecesCache?: Map<PartId | null, Piece[]>,
 	options?: FindOptions<PieceInstance>,
 	pieceInstanceSimulation?: boolean
 ): PieceInstance[] {

packages/webui/src/client/lib/rundownPlaylistUtil.ts

@@ -164,7 +164,7 @@ export class RundownPlaylistClientUtil {
 	static getPiecesForParts(
 		parts: Array<PartId>,
 		piecesOptions?: Omit<FindOptions<Piece>, 'projection'> // We are mangling fields, so block projection
-	): Map<PartId, Piece[]> {
+	): Map<PartId | null, Piece[]> {
 		const allPieces = Pieces.find(
 			{ startPartId: { $in: parts } },
 			{

packages/webui/src/client/ui/ClipTrimPanel/ClipTrimDialog.tsx

@@ -56,6 +56,9 @@ export function ClipTrimDialog({
 	const handleAccept = useCallback((e: SomeEvent) => {
 		onClose?.()
 
+		const startPartId = selectedPiece.startPartId
+		if (!startPartId) return
+
 		doUserAction(
 			t,
 			e,
@@ -65,7 +68,7 @@ export function ClipTrimDialog({
 					e,
 					ts,
 					playlistId,
-					selectedPiece.startPartId,
+					startPartId,
 					selectedPiece._id,
 					state.inPoint,
 					state.duration

packages/webui/src/client/ui/MediaStatus/MediaStatus.tsx

@@ -458,14 +458,14 @@ function usePieceItems(partIds: PartId[], partMeta: Map<PartId, PartMeta>) {
 	const pieceItems = useTracker(
 		() =>
 			pieces.map((piece) => {
-				const meta = partMeta.get(piece.startPartId)
+				const meta = piece.startPartId && partMeta.get(piece.startPartId)
 
 				if (!meta) return
 				return getListItemFromPieceAndPartMeta(
 					piece._id,
 					piece,
 					meta,
-					piece.startPartId,
+					piece.startPartId ?? undefined,
 					undefined,
 					meta.segmentId,
 					false
@@ -499,15 +499,15 @@ function usePieceInstanceItems(partInstanceIds: PartInstanceId[], partInstanceMe
 	const pieceInstanceItems = useTracker(
 		() =>
 			pieceInstances.map((pieceInstance) => {
-				const meta = partInstanceMeta.get(pieceInstance.partInstanceId)
+				const meta = pieceInstance.partInstanceId && partInstanceMeta.get(pieceInstance.partInstanceId)
 
 				if (!meta) return
 				return getListItemFromPieceAndPartMeta(
 					pieceInstance._id,
 					pieceInstance.piece,
 					meta,
 					undefined,
-					pieceInstance.partInstanceId,
+					pieceInstance.partInstanceId ?? undefined,
 					meta.segmentId,
 					false
 				)

packages/webui/src/client/ui/Prompter/prompter.ts

@@ -146,7 +146,7 @@ export namespace PrompterAPI {
 		let previousRundown: Rundown | null = null
 		const rundownIds = rundowns.map((rundown) => rundown._id)
 
-		const allPiecesCache = new Map<PartId, Piece[]>()
+		const allPiecesCache = new Map<PartId | null, Piece[]>()
 		Pieces.find({
 			startRundownId: { $in: rundownIds },
 		}).forEach((piece) => {

packages/webui/src/client/ui/RundownView/SelectedElementsContext.tsx

@@ -221,7 +221,7 @@ export function useSelectedElements(
 		const computation = Tracker.nonreactive(() =>
 			Tracker.autorun(() => {
 				const piece = Pieces.findOne(selectedElement?.elementId)
-				const part = UIParts.findOne({ _id: piece ? piece.startPartId : selectedElement?.elementId })
+				const part = UIParts.findOne({ _id: piece?.startPartId ? piece.startPartId : selectedElement?.elementId })
 				const segment = Segments.findOne({ _id: part ? part.segmentId : selectedElement?.elementId })
 
 				setPiece(piece)