Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion meteor/server/api/integration/rundownContentStatus.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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<ReturnType<typeof checkPieceContentStatusAndDependencies>>[0]
Expand Down Expand Up @@ -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
}
Expand Down
6 changes: 1 addition & 5 deletions meteor/server/api/peripheralDevice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading