Merge branch 'release/26.03'

Author: Julusian

meteor/server/publications/packageManager/expectedPackages/util.ts

@@ -3,7 +3,7 @@ import { MappingExt, MappingsExt, StudioRouteSet } from '@sofie-automation/corel
 import { ReadonlyDeep } from 'type-fest'
 import { getActiveRoutes, getRoutedMappings } from '@sofie-automation/meteor-lib/dist/collections/Studios'
 
-type MappingExtWithOriginalName = MappingExt & { originalLayerName: string }
+type MappingExtWithOriginalName = ReadonlyDeep<MappingExt> & { originalLayerName: string }
 type MappingsExtWithOriginalName = {
 	[layerName: string]: MappingExtWithOriginalName
 }
@@ -13,7 +13,7 @@ export function buildMappingsToDeviceIdMap(
 ): Map<string, PeripheralDeviceId[]> {
 	// Map the expectedPackages onto their specified layer:
 	const mappingsWithPackages: MappingsExtWithOriginalName = {}
-	for (const [layerName, mapping] of Object.entries<MappingExt>(studioMappings)) {
+	for (const [layerName, mapping] of Object.entries<ReadonlyDeep<MappingExt>>(studioMappings)) {
 		mappingsWithPackages[layerName] = {
 			...mapping,
 			originalLayerName: layerName,

meteor/server/publications/pieceContentStatusUI/checkPieceContentStatus.ts

@@ -1186,7 +1186,7 @@ function routeExpectedPackage(
 	expectedPackage: ExpectedPackage.Base
 ): Set<PeripheralDeviceId> {
 	// Collect the relevant mappings
-	const mappingsWithPackages: MappingsExt = {}
+	const mappingsWithPackages: { [layerName: string]: ReadonlyDeep<MappingExt> } = {}
 	for (const layerName of expectedPackage.layers) {
 		const mapping = studioMappings[layerName]
 
@@ -1201,5 +1201,5 @@ function routeExpectedPackage(
 	const routedMappings = getRoutedMappings(mappingsWithPackages, routes)
 
 	// Find the referenced deviceIds
-	return new Set(Object.values<MappingExt>(routedMappings).map((mapping) => mapping.deviceId))
+	return new Set(Object.values<ReadonlyDeep<MappingExt>>(routedMappings).map((mapping) => mapping.deviceId))
 }

packages/job-worker/src/playout/lookahead/index.ts

@@ -36,7 +36,7 @@ function parseSearchDistance(rawVal: number | undefined): number {
 	}
 }
 
-function findLargestLookaheadDistance(mappings: Array<[string, MappingExt]>): number {
+function findLargestLookaheadDistance(mappings: Array<[string, ReadonlyDeep<MappingExt>]>): number {
 	const values = mappings.map(([_id, m]) => parseSearchDistance(m.lookaheadMaxSearchDistance))
 	return _.max(values)
 }
@@ -80,7 +80,7 @@ export async function getLookeaheadObjects(
 ): Promise<Array<TimelineObjRundown & OnGenerateTimelineObjExt>> {
 	const span = context.startSpan('getLookeaheadObjects')
 	const allMappings = context.studio.mappings
-	const mappingsToConsider = Object.entries<MappingExt>(allMappings).filter(
+	const mappingsToConsider = Object.entries<ReadonlyDeep<MappingExt>>(allMappings).filter(
 		([_id, map]) => map.lookahead !== LookaheadMode.NONE && map.lookahead !== undefined
 	)
 	if (mappingsToConsider.length === 0) {

packages/meteor-lib/src/collections/Studios.ts

@@ -7,6 +7,7 @@ import {
 } from '@sofie-automation/corelib/dist/dataModel/Studio'
 import { omit } from '@sofie-automation/corelib/dist/lib'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
+import { ReadonlyDeep } from 'type-fest'
 
 export function getActiveRoutes(routeSets: Record<string, StudioRouteSet>): ResultingMappingRoutes {
 	const routes: ResultingMappingRoutes = {
@@ -47,7 +48,7 @@ export function getActiveRoutes(routeSets: Record<string, StudioRouteSet>): Resu
 
 	return routes
 }
-export function getRoutedMappings<M extends MappingExt>(
+export function getRoutedMappings<M extends ReadonlyDeep<MappingExt>>(
 	inputMappings: { [layerName: string]: M },
 	mappingRoutes: ResultingMappingRoutes
 ): { [layerName: string]: M } {

packages/webui/src/client/ui/Settings/Studio/Mappings.tsx

@@ -44,6 +44,7 @@ import {
 	translateStringIfHasNamespaces,
 } from '../../../lib/forms/schemaFormUtil.js'
 import { Studios } from '../../../collections/index.js'
+import { ReadonlyDeep } from 'type-fest'
 
 export interface MappingsSettingsManifest {
 	displayName: string
@@ -189,7 +190,7 @@ interface DeletedEntryProps {
 	manifestNames: Record<string | number, string>
 	translationNamespaces: string[]
 
-	mapping: MappingExt
+	mapping: ReadonlyDeep<MappingExt>
 	layerId: string
 	doUndelete: (itemId: string) => void
 }
@@ -531,7 +532,7 @@ function StudioMappingsEntry({
 interface MappingSummaryProps {
 	translationNamespaces: string[]
 	fields: SchemaSummaryField[]
-	mapping: MappingExt
+	mapping: ReadonlyDeep<MappingExt>
 }
 function MappingSummary({ translationNamespaces, fields, mapping }: Readonly<MappingSummaryProps>) {
 	if (fields.length > 0) {