chore: remove redundant convertToUIShowStyleBase implementations

Author: justandras

meteor/__mocks__/helpers/database.ts

@@ -33,13 +33,13 @@ import {
 	SofieIngestSegment,
 	SofieIngestRundown,
 } from '@sofie-automation/blueprints-integration'
-import { DBShowStyleBase, UIShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
+import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { Blueprint } from '@sofie-automation/corelib/dist/dataModel/Blueprint'
 import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { stripVersion } from '../../server/systemStatus/semverUtils'
 import { internalUploadBlueprint } from '../../server/api/blueprints/api'
-import { literal, getRandomId, getRandomString, Complete, normalizeArray } from '@sofie-automation/corelib/dist/lib'
+import { literal, getRandomId, getRandomString, normalizeArray } from '@sofie-automation/corelib/dist/lib'
 import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
@@ -887,18 +887,3 @@ export async function setupMockWorker(doc?: Partial<WorkerStatus>): Promise<{
 
 	return { worker, workerThreadStatuses: [workerThreadStatus0, workerThreadStatus1] }
 }
-
-// const studioBlueprint
-// const showStyleBlueprint
-// const showStyleVariant
-
-export function convertToUIShowStyleBase(showStyleBase: DBShowStyleBase): UIShowStyleBase {
-	return literal<Complete<UIShowStyleBase>>({
-		_id: showStyleBase._id,
-		name: showStyleBase.name,
-		hotkeyLegend: showStyleBase.hotkeyLegend,
-		sourceLayers: applyAndValidateOverrides(showStyleBase.sourceLayersWithOverrides).obj,
-		outputLayers: applyAndValidateOverrides(showStyleBase.outputLayersWithOverrides).obj,
-		abChannelDisplay: showStyleBase.abChannelDisplay,
-	})
-}

packages/webui/src/__mocks__/helpers/database.ts

@@ -7,7 +7,7 @@ import {
 	SourceLayerType,
 	IBlueprintPieceType,
 } from '@sofie-automation/blueprints-integration'
-import { DBShowStyleBase, UIShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
+import { DBShowStyleBase } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { DBShowStyleVariant } from '@sofie-automation/corelib/dist/dataModel/ShowStyleVariant'
 import { ICoreSystem, SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { literal, getRandomId, Complete, normalizeArray } from '@sofie-automation/corelib/dist/lib'
@@ -542,20 +542,6 @@ export async function setupDefaultRundown(
 	return rundownId
 }
 
-// // const studioBlueprint
-// // const showStyleBlueprint
-// // const showStyleVariant
-
-export function convertToUIShowStyleBase(showStyleBase: DBShowStyleBase): UIShowStyleBase {
-	return literal<Complete<UIShowStyleBase>>({
-		_id: showStyleBase._id,
-		name: showStyleBase.name,
-		hotkeyLegend: showStyleBase.hotkeyLegend,
-		sourceLayers: applyAndValidateOverrides(showStyleBase.sourceLayersWithOverrides).obj,
-		outputLayers: applyAndValidateOverrides(showStyleBase.outputLayersWithOverrides).obj,
-		abChannelDisplay: showStyleBase.abChannelDisplay,
-	})
-}
 export function convertToUIStudio(studio: DBStudio): UIStudio {
 	return literal<Complete<UIStudio>>({
 		_id: studio._id,

packages/webui/src/client/lib/__tests__/rundown.test.ts

@@ -2,7 +2,6 @@ import {
 	setupDefaultStudioEnvironment,
 	DefaultEnvironment,
 	setupDefaultRundownPlaylist,
-	convertToUIShowStyleBase,
 	convertToUIStudio,
 } from '../../../__mocks__/helpers/database.js'
 import { RundownUtils } from '../rundown.js'
@@ -18,6 +17,7 @@ import { RundownPlaylistCollectionUtil } from '../../collections/rundownPlaylist
 import { RundownPlaylistClientUtil } from '../rundownPlaylistUtil.js'
 import { UIStudio } from '@sofie-automation/corelib/src/dataModel/Studio.js'
 import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance.js'
+import { convertToUIShowStyleBase } from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
 
 const mockRundownPlaylistsCollection = MongoMock.getInnerMockCollection(RundownPlaylists)
 const mockPartInstancesCollection = MongoMock.getInnerMockCollection(PartInstances)