fix: ensure the previousPartInstnace is cleaned up when belonging to a Rundown being removed from the playlist

Author: Julusian

packages/job-worker/src/ingest/commit.ts

@@ -576,7 +576,8 @@ export async function updatePlayoutAfterChangingRundownInPlaylist(
 	context: JobContext,
 	playlist: DBRundownPlaylist,
 	playlistLock: PlaylistLock,
-	insertedRundown: ReadonlyDeep<DBRundown> | null
+	insertedRundown: ReadonlyDeep<DBRundown> | null,
+	rundownIdToForget: RundownId | null
 ): Promise<void> {
 	// ensure the 'old' playout is updated to remove any references to the rundown
 	await runWithPlayoutModel(context, playlist, playlistLock, null, async (playoutModel) => {
@@ -591,6 +592,16 @@ export async function updatePlayoutAfterChangingRundownInPlaylist(
 			return
 		}
 
+		// Ensure previousPartInstance doesn't reference the old Rundown
+		// The current and next partInstances are enforced by allowedToMoveRundownOutOfPlaylist
+		if (
+			rundownIdToForget &&
+			playoutModel.previousPartInstance &&
+			playoutModel.previousPartInstance.partInstance.rundownId === rundownIdToForget
+		) {
+			playoutModel.clearPreviousPartInstance()
+		}
+
 		// Ensure playout is in sync
 
 		if (insertedRundown) {
@@ -711,7 +722,7 @@ export async function removeRundownFromPlaylistAndUpdatePlaylist(
 
 	if (updatedPlaylist) {
 		// ensure the 'old' playout is updated to remove any references to the rundown
-		await updatePlayoutAfterChangingRundownInPlaylist(context, updatedPlaylist, playlistLock, null)
+		await updatePlayoutAfterChangingRundownInPlaylist(context, updatedPlaylist, playlistLock, null, rundownId)
 	}
 }
 

packages/job-worker/src/playout/model/PlayoutModel.ts

@@ -225,6 +225,12 @@ export interface PlayoutModel extends PlayoutModelReadonly, StudioPlayoutModelBa
 	 */
 	clearSelectedPartInstances(): void
 
+	/**
+	 * Clear the currently selected previousPartInstance.
+	 * This can be useful if it references a Rundown that has been removed from the Playlist
+	 */
+	clearPreviousPartInstance(): void
+
 	/**
 	 * Insert an adlibbed PartInstance into the RundownPlaylist
 	 * @param part Part to insert

packages/job-worker/src/playout/model/implementation/PlayoutModelImpl.ts

@@ -346,6 +346,15 @@ export class PlayoutModelImpl extends PlayoutModelReadonlyImpl implements Playou
 		this.#playlistHasChanged = true
 	}
 
+	clearPreviousPartInstance(): void {
+		this.playlistImpl.previousPartInfo = null
+
+		// Make sure that a hold isn't running. We can't block it here, so abort it immediately instead
+		this.playlistImpl.holdState = RundownHoldState.NONE
+
+		this.#playlistHasChanged = true
+	}
+
 	calculatePartTimings(
 		fromPartInstance: PlayoutPartInstanceModel | null,
 		toPartInstance: PlayoutPartInstanceModel,

packages/job-worker/src/rundownPlaylists.ts

@@ -490,7 +490,13 @@ export async function handleMoveRundownIntoPlaylist(
 					}
 
 					// If the playlist is active this could have changed lookahead
-					await updatePlayoutAfterChangingRundownInPlaylist(context, newPlaylist, intoPlaylistLock, rundown)
+					await updatePlayoutAfterChangingRundownInPlaylist(
+						context,
+						newPlaylist,
+						intoPlaylistLock,
+						rundown,
+						null
+					)
 				}
 			)
 		} else {
@@ -540,7 +546,7 @@ export async function handleRestoreRundownsInPlaylistToDefaultOrder(
 
 			if (updatedPlaylist) {
 				// If the playlist is active this could have changed lookahead
-				await updatePlayoutAfterChangingRundownInPlaylist(context, updatedPlaylist, playlistLock, null)
+				await updatePlayoutAfterChangingRundownInPlaylist(context, updatedPlaylist, playlistLock, null, null)
 			}
 		}
 	})