fix: input gateway devices lose rundown actions on reset SOFIE-3134 (#…

…1190)
nrkno · May 24, 2024 · aa69e5d · aa69e5d
1 parent d1a593c
commit aa69e5d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 22 deletions.
diff --git a/meteor/server/api/deviceTriggers/RundownContentObserver.ts b/meteor/server/api/deviceTriggers/RundownContentObserver.ts
@@ -1,10 +1,5 @@
 import { Meteor } from 'meteor/meteor'
-import {
-	RundownId,
-	RundownPlaylistActivationId,
-	RundownPlaylistId,
-	ShowStyleBaseId,
-} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { RundownId, RundownPlaylistId, ShowStyleBaseId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import {
 	PartInstances,
 	Parts,
@@ -44,10 +39,9 @@ export class RundownContentObserver {
 		rundownPlaylistId: RundownPlaylistId,
 		showStyleBaseId: ShowStyleBaseId,
 		rundownIds: RundownId[],
-		activationId: RundownPlaylistActivationId,
 		onChanged: ChangedHandler
 	) {
-		logger.silly(`Creating RundownContentObserver for playlist "${rundownPlaylistId}" activation "${activationId}"`)
+		logger.silly(`Creating RundownContentObserver for playlist "${rundownPlaylistId}"`)
 		const { cache, cancel: cancelCache } = createReactiveContentCache(() => {
 			this.#cleanup = onChanged(cache)
 			if (this.#disposed) this.#cleanup()
@@ -93,7 +87,9 @@ export class RundownContentObserver {
 			),
 			PartInstances.observe(
 				{
-					playlistActivationId: activationId,
+					rundownId: {
+						$in: rundownIds,
+					},
 					reset: {
 						$ne: true,
 					},

diff --git a/meteor/server/api/deviceTriggers/StudioObserver.ts b/meteor/server/api/deviceTriggers/StudioObserver.ts
@@ -183,26 +183,19 @@ export class StudioObserver extends EventEmitter {
 				this.#rundownsLiveQuery = undefined
 
 				const activePlaylistId = this.activePlaylistId
-				const activationId = this.activationId
 				this.showStyleBaseId = showStyleBaseId
 
 				let cleanupChanges: (() => void) | undefined = undefined
 
 				this.#rundownsLiveQuery = new RundownsObserver(activePlaylistId, (rundownIds) => {
 					logger.silly(`Creating new RundownContentObserver`)
-					const obs1 = new RundownContentObserver(
-						activePlaylistId,
-						showStyleBaseId,
-						rundownIds,
-						activationId,
-						(cache) => {
-							cleanupChanges = this.#changed(showStyleBaseId, cache)
-
-							return () => {
-								void 0
-							}
+					const obs1 = new RundownContentObserver(activePlaylistId, showStyleBaseId, rundownIds, (cache) => {
+						cleanupChanges = this.#changed(showStyleBaseId, cache)
+
+						return () => {
+							void 0
 						}
-					)
+					})
 
 					return () => {
 						obs1.stop()