Merge branch 'upstream/fix-find-marker-position' into bbc-release52

bbc · Oct 2, 2024 · c57f790 · c57f790
2 parents 273029b + 8384ba6
commit c57f790
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 9 deletions.
diff --git a/meteor/server/publications/lib/quickLoop.ts b/meteor/server/publications/lib/quickLoop.ts
@@ -118,16 +118,15 @@ export function findMarkerPosition(
 	marker: QuickLoopMarker,
 	fallback: number,
 	segmentCache: ReadonlyObjectDeep<ReactiveCacheCollection<Pick<DBSegment, '_id' | '_rank' | 'rundownId'>>>,
-	partCache:
-		| { parts: ReadonlyObjectDeep<ReactiveCacheCollection<Pick<DBPart, '_id' | '_rank' | 'segmentId'>>> }
-		| { partInstances: ReadonlyObjectDeep<ReactiveCacheCollection<DBPartInstance>> },
+	partCache: {
+		parts?: ReadonlyObjectDeep<ReactiveCacheCollection<Pick<DBPart, '_id' | '_rank' | 'segmentId'>>>
+		partInstances?: ReadonlyObjectDeep<ReactiveCacheCollection<DBPartInstance>>
+	},
 	rundownRanks: Record<string, number>
 ): MarkerPosition {
 	const part =
 		marker.type === QuickLoopMarkerType.PART
-			? 'parts' in partCache
-				? partCache.parts.findOne(marker.id)
-				: partCache.partInstances.findOne({ 'part._id': marker.id })?.part
+			? partCache.partInstances?.findOne({ 'part._id': marker.id })?.part ?? partCache.parts?.findOne(marker.id)
 			: undefined
 	const partRank = part?._rank ?? fallback
 

diff --git a/meteor/server/publications/partInstancesUI/publication.ts b/meteor/server/publications/partInstancesUI/publication.ts
@@ -162,7 +162,7 @@ export async function manipulateUIPartInstancesPublicationData(
 			playlist.quickLoop.start,
 			-Infinity,
 			state.contentCache.Segments,
-			{ partInstances: state.contentCache.PartInstances },
+			{ partInstances: state.contentCache.PartInstances, parts: state.contentCache.Parts },
 			rundownRanks
 		)
 	const quickLoopEndPosition =
@@ -171,7 +171,7 @@ export async function manipulateUIPartInstancesPublicationData(
 			playlist.quickLoop.end,
 			Infinity,
 			state.contentCache.Segments,
-			{ partInstances: state.contentCache.PartInstances },
+			{ partInstances: state.contentCache.PartInstances, parts: state.contentCache.Parts },
 			rundownRanks
 		)
 

diff --git a/meteor/server/publications/partInstancesUI/reactiveContentCache.ts b/meteor/server/publications/partInstancesUI/reactiveContentCache.ts
@@ -5,6 +5,7 @@ import { MongoFieldSpecifierOnesStrict, MongoFieldSpecifierZeroes } from '@sofie
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { DBStudio } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
+import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 
 export type RundownPlaylistCompact = Pick<DBRundownPlaylist, '_id' | 'activationId' | 'quickLoop' | 'rundownIdsInOrder'>
 export const rundownPlaylistFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<RundownPlaylistCompact>>({
@@ -21,6 +22,14 @@ export const segmentFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<
 	rundownId: 1,
 })
 
+export type PartFields = '_id' | '_rank' | 'rundownId' | 'segmentId'
+export const partFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<DBPart, PartFields>>>({
+	_id: 1,
+	_rank: 1,
+	segmentId: 1,
+	rundownId: 1,
+})
+
 export type PartInstanceOmitedFields = 'part.privateData'
 export const partInstanceFieldSpecifier = literal<MongoFieldSpecifierZeroes<DBPartInstance>>({
 	// @ts-expect-error Mongo typings aren't clever enough yet
@@ -36,6 +45,7 @@ export const studioFieldSpecifier = literal<MongoFieldSpecifierOnesStrict<Pick<D
 export interface ContentCache {
 	Studios: ReactiveCacheCollection<Pick<DBStudio, StudioFields>>
 	Segments: ReactiveCacheCollection<Pick<DBSegment, SegmentFields>>
+	Parts: ReactiveCacheCollection<Pick<DBPart, PartFields>>
 	PartInstances: ReactiveCacheCollection<Omit<DBPartInstance, PartInstanceOmitedFields>>
 	RundownPlaylists: ReactiveCacheCollection<RundownPlaylistCompact>
 }
@@ -44,6 +54,7 @@ export function createReactiveContentCache(): ContentCache {
 	const cache: ContentCache = {
 		Studios: new ReactiveCacheCollection<Pick<DBStudio, StudioFields>>('studios'),
 		Segments: new ReactiveCacheCollection<Pick<DBSegment, SegmentFields>>('segments'),
+		Parts: new ReactiveCacheCollection<Pick<DBPart, PartFields>>('parts'),
 		PartInstances: new ReactiveCacheCollection<Omit<DBPartInstance, PartInstanceOmitedFields>>('partInstances'),
 		RundownPlaylists: new ReactiveCacheCollection<RundownPlaylistCompact>('rundownPlaylists'),
 	}

diff --git a/meteor/server/publications/partInstancesUI/rundownContentObserver.ts b/meteor/server/publications/partInstancesUI/rundownContentObserver.ts
@@ -3,12 +3,13 @@ import { RundownId, RundownPlaylistActivationId, StudioId } from '@sofie-automat
 import { logger } from '../../logging'
 import {
 	ContentCache,
+	partFieldSpecifier,
 	partInstanceFieldSpecifier,
 	rundownPlaylistFieldSpecifier,
 	segmentFieldSpecifier,
 	studioFieldSpecifier,
 } from './reactiveContentCache'
-import { PartInstances, RundownPlaylists, Segments, Studios } from '../../collections'
+import { PartInstances, Parts, RundownPlaylists, Segments, Studios } from '../../collections'
 
 export class RundownContentObserver {
 	#observers: Meteor.LiveQueryHandle[] = []
@@ -53,6 +54,17 @@ export class RundownContentObserver {
 					projection: segmentFieldSpecifier,
 				}
 			),
+			Parts.observeChanges(
+				{
+					rundownId: {
+						$in: rundownIds,
+					},
+				},
+				cache.Parts.link(),
+				{
+					projection: partFieldSpecifier,
+				}
+			),
 			PartInstances.observeChanges(
 				{
 					rundownId: {