Skip to content

Commit d220d03

Browse files
committed
chore: remove redundant wrapPartToTemporaryInstance implementations
1 parent ee42d00 commit d220d03

8 files changed

Lines changed: 11 additions & 47 deletions

File tree

packages/job-worker/src/__mocks__/partinstance.ts

Lines changed: 0 additions & 21 deletions
This file was deleted.

packages/job-worker/src/blueprints/__tests__/context-events.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { protectString, unprotectString } from '@sofie-automation/corelib/dist/p
99
import { MockJobContext, setupDefaultJobEnvironment } from '../../__mocks__/context.js'
1010
import { setupDefaultRundownPlaylist, setupMockShowStyleCompound } from '../../__mocks__/presetCollections.js'
1111
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
12-
import { wrapPartToTemporaryInstance } from '../../__mocks__/partinstance.js'
12+
import { wrapPartToTemporaryInstance } from '@sofie-automation/corelib/dist/playout/stateCacheResolver'
1313
import { ReadonlyDeep } from 'type-fest'
1414
import { convertPartInstanceToBlueprints } from '../context/lib.js'
1515
import { EmptyPieceTimelineObjectsBlob } from '@sofie-automation/corelib/dist/dataModel/Piece'

packages/job-worker/src/playout/__tests__/infinites.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import { setupDefaultRundownPlaylist, setupMockShowStyleCompound } from '../../_
77
import { getRandomId } from '@sofie-automation/corelib/dist/lib'
88
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
99
import { runJobWithPlayoutModel } from '../lock.js'
10-
import { wrapPartToTemporaryInstance } from '../../__mocks__/partinstance.js'
1110
import { protectString } from '@sofie-automation/corelib/dist/protectedString'
11+
import { wrapPartToTemporaryInstance } from '@sofie-automation/corelib/dist/playout/stateCacheResolver'
1212

1313
describe('canContinueAdlibOnEndInfinites', () => {
1414
let context: MockJobContext

packages/job-worker/src/playout/lookahead/__tests__/util.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { MockJobContext, setupDefaultJobEnvironment } from '../../../__mocks__/c
99
import { runJobWithPlayoutModel } from '../../../playout/lock.js'
1010
import { defaultRundownPlaylist } from '../../../__mocks__/defaultCollectionObjects.js'
1111
import _ from 'underscore'
12-
import { wrapPartToTemporaryInstance } from '../../../__mocks__/partinstance.js'
1312
import { wrapDefaultObject } from '@sofie-automation/corelib/dist/settings/objectWithOverrides'
1413
import { QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
1514
import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings'
15+
import { wrapPartToTemporaryInstance } from '@sofie-automation/corelib/dist/playout/stateCacheResolver'
1616

1717
describe('getOrderedPartsAfterPlayhead', () => {
1818
let context!: MockJobContext

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

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,8 @@
11
import { protectString, unprotectString } from '@sofie-automation/corelib/dist/protectedString'
22
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
33
import { PartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
4-
import { PartId, RundownPlaylistActivationId } from '@sofie-automation/corelib/dist/dataModel/Ids'
5-
6-
export function wrapPartToTemporaryInstance(
7-
playlistActivationId: RundownPlaylistActivationId,
8-
part: DBPart
9-
): PartInstance {
10-
return {
11-
isTemporary: true,
12-
_id: protectString(`${part._id}_tmp_instance`),
13-
rundownId: part.rundownId,
14-
segmentId: part.segmentId,
15-
playlistActivationId,
16-
segmentPlayoutId: protectString(''), // Only needed when stored in the db, and filled in nearer the time
17-
takeCount: -1,
18-
rehearsal: false,
19-
part: part,
20-
}
21-
}
4+
import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
5+
import { wrapPartToTemporaryInstance } from '@sofie-automation/corelib/dist/playout/stateCacheResolver'
226

237
export function findPartInstanceInMapOrWrapToTemporary<T extends Partial<PartInstance>>(
248
partInstancesMap: Map<PartId, T>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { DBRundownPlaylist, QuickLoopMarkerType } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
22
import { ForceQuickLoopAutoNext } from '@sofie-automation/shared-lib/dist/core/model/StudioSettings'
3-
import { wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
43
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
54
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
65
import { DBRundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
@@ -10,6 +9,7 @@ import { RundownTimingCalculator, RundownTimingContext, findPartInstancesInQuick
109
import { PlaylistTimingType, SegmentTimingInfo } from '@sofie-automation/blueprints-integration'
1110
import { PartId, RundownId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
1211
import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance.js'
12+
import { wrapPartToTemporaryInstance } from '@sofie-automation/corelib/src/playout/stateCacheResolver'
1313

1414
const DEFAULT_DURATION = 0
1515
const DEFAULT_NONZERO_DURATION = 4000

packages/webui/src/client/ui/RundownView/RundownTiming/RundownTimingProvider.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { Meteor } from 'meteor/meteor'
33
import { withTracker } from '../../../lib/ReactMeteorData/react-meteor-data.js'
44
import { protectString } from '@sofie-automation/shared-lib/dist/lib/protectedString'
55
import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
6-
import { wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
76
import { RundownTiming, TimeEventArgs } from './RundownTiming.js'
87
import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
98
import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
@@ -21,7 +20,10 @@ import { RundownPlaylistClientUtil } from '../../../lib/rundownPlaylistUtil.js'
2120
import { getCurrentTime } from '../../../lib/systemTime.js'
2221
import { IRundownTimingProviderValues, RundownTimingProviderContext } from './withTiming.js'
2322
import { PartInstance } from '@sofie-automation/corelib/src/dataModel/PartInstance.js'
24-
import { deduplicatePartInstancesForQuickLoop } from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
23+
import {
24+
deduplicatePartInstancesForQuickLoop,
25+
wrapPartToTemporaryInstance,
26+
} from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
2527

2628
const TIMING_DEFAULT_REFRESH_INTERVAL = 1000 / 60 // the interval for high-resolution events (timeupdateHR)
2729
const LOW_RESOLUTION_TIMING_DECIMATOR = 15

packages/webui/src/client/ui/SegmentTimeline/SegmentTimeline.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ import RundownViewEventBus, {
3232
RundownViewEvents,
3333
HighlightEvent,
3434
} from '@sofie-automation/meteor-lib/dist/triggers/RundownViewEventBus'
35-
import { wrapPartToTemporaryInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
3635

3736
import { SegmentTimelineSmallPartFlag } from './SmallParts/SegmentTimelineSmallPartFlag.js'
3837
import { UIStateStorage } from '../../lib/UIStateStorage.js'
@@ -57,7 +56,7 @@ import { SelectedElementsContext } from '../RundownView/SelectedElementsContext.
5756
import { BlueprintAssetIcon } from '../../lib/Components/BlueprintAssetIcon.js'
5857
import { UIStudio } from '@sofie-automation/corelib/src/dataModel/Studio.js'
5958
import { PieceUi } from '@sofie-automation/corelib/src/dataModel/Piece.js'
60-
import { isLoopRunning } from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
59+
import { isLoopRunning, wrapPartToTemporaryInstance } from '@sofie-automation/corelib/src/playout/stateCacheResolver.js'
6160
import { hasUserEditableContent } from '../UserEditOperations/PropertiesPanel.js'
6261

6362
interface IProps {

0 commit comments

Comments
 (0)