Merge branch 'release52' into release53

# Conflicts:
#	meteor/server/publications/buckets.ts
#	packages/webui/public/origo-ui/dist/origo.css
#	packages/webui/src/client/lib/ModalDialog.tsx
#	packages/webui/src/client/ui/App.tsx
#	packages/webui/src/client/ui/FloatingInspectors/VTFloatingInspector.tsx
#	packages/webui/src/client/ui/Header.tsx
#	packages/webui/src/client/ui/RundownView.tsx
#	packages/webui/src/client/ui/RundownView/SwitchboardPopUp.tsx
#	packages/webui/src/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSecondaryPiece.tsx
#	packages/webui/src/client/ui/Settings.tsx
#	packages/webui/src/client/ui/Status.tsx
#	packages/webui/src/client/ui/Status/MediaManager.tsx
#	packages/webui/src/client/ui/SupportPopUp.tsx
#	packages/webui/src/client/ui/TestTools/index.tsx
#	packages/yarn.lock

Author: nytamin

.github/workflows/node.yaml

@@ -252,7 +252,7 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -405,7 +405,7 @@ jobs:
           echo "image=$image" >> $GITHUB_OUTPUT
       - name: Trivy scanning
         if: steps.check-build-and-push.outputs.enable == 'true' && steps.check-ghcr.outputs.enable == 'true' && steps.ghcr-tag.outputs.tags != 0
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:

.github/workflows/trivy.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Run Trivy vulnerability scanner (json)
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -26,7 +26,7 @@ jobs:
           output: "${{ matrix.image }}-trivy-scan-results.json"
 
       - name: Run Trivy vulnerability scanner (table)
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:
@@ -44,7 +44,7 @@ jobs:
           echo $CODE_BLOCK >> $GITHUB_STEP_SUMMARY
 
       - name: Run Trivy in GitHub SBOM mode and submit results to Dependency Graph
-        uses: aquasecurity/trivy-action@0.29.0
+        uses: aquasecurity/trivy-action@0.30.0
         env:
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
         with:

meteor/package.json

@@ -67,7 +67,7 @@
 		"object-path": "^0.11.8",
 		"p-lazy": "^3.1.0",
 		"semver": "^7.6.3",
-		"superfly-timeline": "9.0.2",
+		"superfly-timeline": "9.1.2",
 		"threadedclass": "^1.2.2",
 		"timecode": "0.0.4",
 		"type-fest": "^4.33.0",

meteor/server/api/deviceTriggers/RundownsObserver.ts

@@ -5,6 +5,8 @@ import { literal } from '@sofie-automation/corelib/dist/lib'
 import { MongoFieldSpecifierOnesStrict } from '@sofie-automation/corelib/dist/mongo'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { PromiseDebounce } from '../../publications/lib/PromiseDebounce'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
+import { logger } from '../../logging'
 
 const REACTIVITY_DEBOUNCE = 20
 
@@ -24,15 +26,19 @@ export class RundownsObserver {
 	#disposed = false
 
 	readonly #triggerUpdateRundownContent = new PromiseDebounce(async () => {
-		if (this.#disposed) return
+		try {
+			if (this.#disposed) return
 
-		if (!this.#changed) return
-		this.#cleanup?.()
+			if (!this.#changed) return
+			this.#cleanup?.()
 
-		const changed = this.#changed
-		this.#cleanup = await changed(this.rundownIds)
+			const changed = this.#changed
+			this.#cleanup = await changed(this.rundownIds)
 
-		if (this.#disposed) this.#cleanup?.()
+			if (this.#disposed) this.#cleanup?.()
+		} catch (e) {
+			logger.error(`Error in RundownsObserver triggerUpdateRundownContent: ${stringifyError(e)}`)
+		}
 	}, REACTIVITY_DEBOUNCE)
 
 	private constructor(onChanged: ChangedHandler) {

meteor/server/migration/1_52_0.ts

@@ -82,6 +82,7 @@ export const addSteps = addMigrationSteps('1.52.0', [
 				// .abPlayers in the overrides:
 				for (const override of studio.routeSetsWithOverrides.overrides) {
 					if (override.op === 'set') {
+						if (override.path.includes('.')) continue // Only include overrides at the top level
 						const value = override.value as StudioRouteSet
 
 						if (!value.abPlayers) {
@@ -113,6 +114,7 @@ export const addSteps = addMigrationSteps('1.52.0', [
 				// .abPlayers in the overrides:
 				for (const override of newRouteSetsWithOverrides.overrides) {
 					if (override.op === 'set') {
+						if (override.path.includes('.')) continue // Only include overrides at the top level
 						const value = override.value as StudioRouteSet
 
 						if (!value.abPlayers) {

meteor/server/publications/buckets.ts

@@ -51,6 +51,7 @@ meteorPublish(
 		return BucketAdLibs.findWithCursor(selector, {
 			projection: {
 				ingestInfo: 0, // This is a large blob, and is not of interest to the UI
+				privateData: 0,
 			},
 		})
 	}
@@ -76,6 +77,7 @@ meteorPublish(
 		return BucketAdLibActions.findWithCursor(selector, {
 			projection: {
 				ingestInfo: 0, // This is a large blob, and is not of interest to the UI
+				privateData: 0,
 			},
 		})
 	}

meteor/server/publications/lib/PromiseDebounce.ts

@@ -38,6 +38,7 @@ export class PromiseDebounce<TResult = void, TArgs extends unknown[] = []> {
 
 	/**
 	 * Trigger an execution, but don't report the result.
+	 * Warning: If the function throws an error, that will not be logged or reported to the caller
 	 */
 	trigger = (...args: TArgs): void => {
 		// If an execution is 'imminent', don't do anything

meteor/server/publications/lib/rundownsObserver.ts

@@ -2,6 +2,8 @@ import { Meteor } from 'meteor/meteor'
 import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { Rundowns } from '../../collections'
 import { PromiseDebounce } from './PromiseDebounce'
+import { logger } from '../../logging'
+import { stringifyError } from '@sofie-automation/shared-lib/dist/lib/stringifyError'
 
 const REACTIVITY_DEBOUNCE = 20
 
@@ -20,14 +22,22 @@ export class RundownsObserver implements Meteor.LiveQueryHandle {
 	#disposed = false
 
 	readonly #triggerUpdateRundownContent = new PromiseDebounce(async () => {
-		if (this.#disposed) return
-		if (!this.#changed) return
-		this.#cleanup?.()
-
-		const changed = this.#changed
-		this.#cleanup = await changed(this.rundownIds)
-
-		if (this.#disposed) this.#cleanup?.()
+		try {
+			if (this.#disposed) return
+			if (!this.#changed) return
+			this.#cleanup?.()
+			this.#cleanup = undefined
+
+			const changed = this.#changed
+			this.#cleanup = await changed(this.rundownIds)
+
+			if (this.#disposed) {
+				this.#cleanup?.()
+				this.#cleanup = undefined
+			}
+		} catch (e) {
+			logger.error(`Error in RundownsObserver triggerUpdateRundownContent: ${stringifyError(e)}`)
+		}
 	}, REACTIVITY_DEBOUNCE)
 
 	private constructor(onChanged: ChangedHandler) {

meteor/yarn.lock

@@ -1160,7 +1160,7 @@ __metadata:
     mongodb: "npm:^6.12.0"
     p-lazy: "npm:^3.1.0"
     p-timeout: "npm:^4.1.0"
-    superfly-timeline: "npm:9.0.2"
+    superfly-timeline: "npm:9.1.2"
     threadedclass: "npm:^1.2.2"
     tslib: "npm:^2.8.1"
     type-fest: "npm:^4.33.0"
@@ -1191,7 +1191,7 @@ __metadata:
   resolution: "@sofie-automation/shared-lib@portal:../packages/shared-lib::locator=automation-core%40workspace%3A."
   dependencies:
     "@mos-connection/model": "npm:^4.2.2"
-    timeline-state-resolver-types: "npm:9.3.0-release52.0"
+    timeline-state-resolver-types: "npm:9.3.0-release52.2"
     tslib: "npm:^2.8.1"
     type-fest: "npm:^4.33.0"
   languageName: node
@@ -2291,7 +2291,7 @@ __metadata:
     prettier: "npm:^2.8.8"
     semver: "npm:^7.6.3"
     standard-version: "npm:^9.5.0"
-    superfly-timeline: "npm:9.0.2"
+    superfly-timeline: "npm:9.1.2"
     threadedclass: "npm:^1.2.2"
     timecode: "npm:0.0.4"
     ts-jest: "npm:^29.2.5"
@@ -10152,12 +10152,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"superfly-timeline@npm:9.0.2":
-  version: 9.0.2
-  resolution: "superfly-timeline@npm:9.0.2"
+"superfly-timeline@npm:9.1.2":
+  version: 9.1.2
+  resolution: "superfly-timeline@npm:9.1.2"
   dependencies:
     tslib: "npm:^2.6.0"
-  checksum: 10/1459938b2f05858a9563b23774ffeb9376c8babcf8ea59cf10ec76296ae4d8a923f9b6858bf86517dbe7eaba705150b3f502cac11354b92c241efc52ffe3fe0f
+  checksum: 10/f77552cb8b4faab5d13aa88da364498c90d5117427af739fa456d73acd26075fe2e04cc227b8d58d45a4684af7115c24a7e5867c85479a2c0aba3f43b6230367
   languageName: node
   linkType: hard
 
@@ -10332,12 +10332,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"timeline-state-resolver-types@npm:9.3.0-release52.0":
-  version: 9.3.0-release52.0
-  resolution: "timeline-state-resolver-types@npm:9.3.0-release52.0"
+"timeline-state-resolver-types@npm:9.3.0-release52.2":
+  version: 9.3.0-release52.2
+  resolution: "timeline-state-resolver-types@npm:9.3.0-release52.2"
   dependencies:
     tslib: "npm:^2.6.3"
-  checksum: 10/162d765cb3f3a673e284ed942aa355c7ab136f092989f28626f73def5f9878fdff763160e3372c8b5da681c9bfdaf104b02c4879bfadbd70fa699a8403920261
+  checksum: 10/2f50474e96d6f10d085788b59c2a8a2bedcf8511646424afcb9c2b421798e689894028629f0c55d0b76dc5f543cba06367c7be93c2662608a3804f60c108ded2
   languageName: node
   linkType: hard
 

packages/blueprints-integration/src/context/syncIngestChangesContext.ts

@@ -5,8 +5,9 @@ import type {
 	IBlueprintPiece,
 	IBlueprintPieceInstance,
 } from '../documents'
+import type { IEventContext } from './eventContext'
 
-export interface ISyncIngestUpdateToPartInstanceContext extends IRundownUserContext {
+export interface ISyncIngestUpdateToPartInstanceContext extends IRundownUserContext, IEventContext {
 	/** Sync a pieceInstance. Inserts the pieceInstance if new, updates if existing. Optionally pass in a mutated Piece, to override the content of the instance */
 	syncPieceInstance(
 		pieceInstanceId: string,