From 438e03e27466b648fccebf433b6748cc0a1852e2 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 17 Jul 2026 09:16:00 +0000 Subject: [PATCH 1/2] fix: resolve sourceLayers from sourceLayersWithOverrides in rundown content status MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit DBShowStyleBase stores source layers in sourceLayersWithOverrides, not sourceLayers. Apply overrides before looking up piece source layers, matching the pattern used elsewhere in pieceContentStatusUI. Co-authored-by: Jakub Doboš --- meteor/server/api/integration/rundownContentStatus.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meteor/server/api/integration/rundownContentStatus.ts b/meteor/server/api/integration/rundownContentStatus.ts index feae14e4c6..40b4086c78 100644 --- a/meteor/server/api/integration/rundownContentStatus.ts +++ b/meteor/server/api/integration/rundownContentStatus.ts @@ -16,6 +16,7 @@ import { } from '../../publications/pieceContentStatusUI/checkPieceContentStatus' import { PieceContentStatusMessageFactory } from '../../publications/pieceContentStatusUI/messageFactory' import { interpollateTranslation, translateMessage } from '@sofie-automation/corelib/dist/TranslatableMessage' +import { applyAndValidateOverrides } from '@sofie-automation/corelib/dist/settings/objectWithOverrides' function formatStatusReason( status: Awaited>[0] @@ -75,10 +76,14 @@ export namespace RundownContentStatusIntegration { invalid: { $ne: true }, }) + const sourceLayers = showStyleBase + ? applyAndValidateOverrides(showStyleBase.sourceLayersWithOverrides).obj + : undefined + const pieces: RundownPieceContentStatus[] = [] for (const pieceDoc of pieceDocs) { - const sourceLayer = showStyleBase?.sourceLayers?.[pieceDoc.sourceLayerId] + const sourceLayer = sourceLayers?.[pieceDoc.sourceLayerId] if (!sourceLayer) { continue } From 1cd0d174a77d136ff300fb088fb85092c0d8c407 Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Fri, 17 Jul 2026 09:33:50 +0000 Subject: [PATCH 2/2] style: fix prettier formatting in getContentStatusForRundown signature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jakub Doboš --- meteor/server/api/peripheralDevice.ts | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meteor/server/api/peripheralDevice.ts b/meteor/server/api/peripheralDevice.ts index 85600c1092..7189bd6f15 100644 --- a/meteor/server/api/peripheralDevice.ts +++ b/meteor/server/api/peripheralDevice.ts @@ -1435,11 +1435,7 @@ class ServerPeripheralDeviceAPIClass extends MethodContextAPI implements NewPeri ) { await PackageManagerIntegration.removePackageInfo(this, deviceId, deviceToken, type, packageId, removeDelay) } - async getContentStatusForRundown( - deviceId: PeripheralDeviceId, - deviceToken: string, - rundownExternalId: string - ) { + async getContentStatusForRundown(deviceId: PeripheralDeviceId, deviceToken: string, rundownExternalId: string) { return RundownContentStatusIntegration.getContentStatusForRundown( this, deviceId,