chore: move logic to client

Julusian · Julusian · commit 38f44236ea45 · 2024-07-22T13:31:51.000+01:00
diff --git a/meteor/client/lib/RundownResolver.ts b/meteor/client/lib/RundownResolver.ts
@@ -1,31 +1,30 @@
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { IOutputLayer, ISourceLayer, ITranslatableMessage } from '@sofie-automation/blueprints-integration'
+import { IOutputLayer, ISourceLayer } from '@sofie-automation/blueprints-integration'
 import { DBSegment, SegmentOrphanedReason } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
-import { PartInstance, wrapPartToTemporaryInstance } from './collections/PartInstances'
+import { PartInstance, wrapPartToTemporaryInstance } from '../../lib/collections/PartInstances'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import {
 	getPieceInstancesForPart,
 	buildPiecesStartingInThisPartQuery,
 	buildPastInfinitePiecesForThisPartQuery,
 } from '@sofie-automation/corelib/dist/playout/infinites'
-import { invalidateAfter } from '../lib/invalidatingTime'
-import { getCurrentTime, groupByToMap, ProtectedString, protectString } from './lib'
+import { invalidateAfter } from '../../lib/invalidatingTime'
+import { getCurrentTime, groupByToMap, protectString } from '../../lib/lib'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
-import { isTranslatableMessage } from '@sofie-automation/corelib/dist/TranslatableMessage'
 import { mongoWhereFilter, MongoQuery } from '@sofie-automation/corelib/dist/mongo'
-import { FindOptions } from './collections/lib'
+import { FindOptions } from '../../lib/collections/lib'
 import {
 	PartId,
 	RundownId,
 	RundownPlaylistActivationId,
 	SegmentId,
 	ShowStyleBaseId,
 } from '@sofie-automation/corelib/dist/dataModel/Ids'
-import { PieceInstances, Pieces } from './collections/libCollections'
-import { RundownPlaylistCollectionUtil } from './collections/rundownPlaylistUtil'
-import { PieceContentStatusObj } from './api/pieceContentStatus'
+import { PieceInstances, Pieces } from '../../lib/collections/libCollections'
+import { RundownPlaylistCollectionUtil } from '../../lib/collections/rundownPlaylistUtil'
+import { PieceContentStatusObj } from '../../lib/api/pieceContentStatus'
 import { ReadonlyDeep } from 'type-fest'
 import { PieceInstanceWithTimings } from '@sofie-automation/corelib/dist/playout/processAndPrune'
 
@@ -322,85 +321,3 @@ export function getSegmentsWithPartInstances(
 		}
 	})
 }
-
-// 1 reactivelly listen to data changes
-/*
-setup () {
-	RundownPlaylists.find().observeChanges(
-		asdf: onReactiveDataChange
-	)
-}
-
-onReactiveDataChange () {
-	setTimeoutIgnore(() => {
-		updateCalculatedData()
-	}, 200)
-}
-
-const cachedSegments = {}
-updateCalculatedData () {
-
-	const data = calculateBigDataSet()
-
-	data.segments
-}
-*/
-
-function compareLabels(a: string | ITranslatableMessage, b: string | ITranslatableMessage) {
-	const actualA = isTranslatableMessage(a) ? a.key : (a as string)
-	const actualB = isTranslatableMessage(b) ? b.key : (b as string)
-	// can't use .localeCompare, because this needs to be locale-independent and always return
-	// the same sorting order, because that's being relied upon by limit & pick/pickEnd.
-	if (actualA > actualB) return 1
-	if (actualA < actualB) return -1
-	return 0
-}
-
-/** Sort a list of adlibs */
-export function sortAdlibs<T>(
-	adlibs: {
-		adlib: T
-		label: string | ITranslatableMessage
-		adlibRank: number
-		adlibId: ProtectedString<any> | string
-		partRank: number | null
-		segmentRank: number | null
-		rundownRank: number | null
-	}[]
-): T[] {
-	adlibs = adlibs.sort((a, b) => {
-		// Sort by rundown rank, where applicable:
-		a.rundownRank = a.rundownRank ?? Number.POSITIVE_INFINITY
-		b.rundownRank = b.rundownRank ?? Number.POSITIVE_INFINITY
-		if (a.rundownRank > b.rundownRank) return 1
-		if (a.rundownRank < b.rundownRank) return -1
-
-		// Sort by segment rank, where applicable:
-		a.segmentRank = a.segmentRank ?? Number.POSITIVE_INFINITY
-		b.segmentRank = b.segmentRank ?? Number.POSITIVE_INFINITY
-		if (a.segmentRank > b.segmentRank) return 1
-		if (a.segmentRank < b.segmentRank) return -1
-
-		// Sort by part rank, where applicable:
-		a.partRank = a.partRank ?? Number.POSITIVE_INFINITY
-		b.partRank = b.partRank ?? Number.POSITIVE_INFINITY
-		if (a.partRank > b.partRank) return 1
-		if (a.partRank < b.partRank) return -1
-
-		// Sort by adlib rank
-		if (a.adlibRank > b.adlibRank) return 1
-		if (a.adlibRank < b.adlibRank) return -1
-
-		// Sort by labels:
-		const r = compareLabels(a.label, b.label)
-		if (r !== 0) return r
-
-		// As a last resort, sort by ids:
-		if (a.adlibId > b.adlibId) return 1
-		if (a.adlibId < b.adlibId) return -1
-
-		return 0
-	})
-
-	return adlibs.map((a) => a.adlib)
-}
diff --git a/meteor/client/lib/rundown.ts b/meteor/client/lib/rundown.ts
@@ -19,7 +19,7 @@ import {
 	ISourceLayerExtended,
 	PartInstanceLimited,
 	getSegmentsWithPartInstances,
-} from '../../lib/Rundown'
+} from './RundownResolver'
 import { PartInstance } from '../../lib/collections/PartInstances'
 import { DBSegment } from '@sofie-automation/corelib/dist/dataModel/Segment'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
diff --git a/meteor/client/ui/ClockView/CameraScreen/Part.tsx b/meteor/client/ui/ClockView/CameraScreen/Part.tsx
@@ -3,7 +3,7 @@ import classNames from 'classnames'
 import React, { useContext } from 'react'
 import { AreaZoom } from '.'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { getAllowSpeaking, getAllowVibrating } from '../../../lib/localStorage'
 import { getPartInstanceTimingValue } from '../../../lib/rundownTiming'
 import { AutoNextStatus } from '../../RundownView/RundownTiming/AutoNextStatus'
diff --git a/meteor/client/ui/ClockView/CameraScreen/Piece.tsx b/meteor/client/ui/ClockView/CameraScreen/Piece.tsx
@@ -2,7 +2,7 @@ import React, { useContext, useMemo } from 'react'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import classNames from 'classnames'
 import { CanvasSizeContext } from '.'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { PieceElement } from '../../SegmentContainer/PieceElement'
 import { getSplitItems } from '../../SegmentContainer/getSplitItems'
 
diff --git a/meteor/client/ui/ClockView/CameraScreen/index.tsx b/meteor/client/ui/ClockView/CameraScreen/index.tsx
@@ -6,7 +6,7 @@ import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { MeteorPubSub } from '../../../../lib/api/pubsub'
 import { UIStudio } from '../../../../lib/api/studios'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { PartInstances, Rundowns } from '../../../collections'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { UIStudios } from '../../Collections'
diff --git a/meteor/client/ui/MediaStatus/MediaStatus.tsx b/meteor/client/ui/MediaStatus/MediaStatus.tsx
@@ -1,7 +1,7 @@
 import { useMemo, JSX } from 'react'
 import { useSubscription, useSubscriptions, useTracker } from '../../lib/ReactMeteorData/ReactMeteorData'
 import { MeteorPubSub } from '../../../lib/api/pubsub'
-import { getSegmentsWithPartInstances } from '../../../lib/Rundown'
+import { getSegmentsWithPartInstances } from '../../lib/RundownResolver'
 import {
 	AdLibActionId,
 	PartId,
diff --git a/meteor/client/ui/PieceIcons/utils.ts b/meteor/client/ui/PieceIcons/utils.ts
@@ -2,7 +2,7 @@ import { SourceLayerType, ISourceLayer } from '@sofie-automation/blueprints-inte
 import { SourceLayers } from '@sofie-automation/corelib/dist/dataModel/ShowStyleBase'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { IPropsHeader } from './PieceIcon'
-import { PieceExtended } from '../../../lib/Rundown'
+import { PieceExtended } from '../../lib/RundownResolver'
 import { UIShowStyleBases } from '../Collections'
 import { PieceInstances } from '../../collections'
 import { ReadonlyDeep } from 'type-fest'
diff --git a/meteor/client/ui/Prompter/prompter.ts b/meteor/client/ui/Prompter/prompter.ts
@@ -3,7 +3,7 @@ import * as _ from 'underscore'
 import { ScriptContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import { normalizeArrayToMap, protectString } from '../../../lib/lib'
 import { Piece } from '@sofie-automation/corelib/dist/dataModel/Piece'
-import { getPieceInstancesForPartInstance, getSegmentsWithPartInstances } from '../../../lib/Rundown'
+import { getPieceInstancesForPartInstance, getSegmentsWithPartInstances } from '../../lib/RundownResolver'
 import { FindOptions } from '../../../lib/collections/lib'
 import { PieceInstance } from '@sofie-automation/corelib/dist/dataModel/PieceInstance'
 import { Rundown } from '@sofie-automation/corelib/dist/dataModel/Rundown'
diff --git a/meteor/client/ui/SegmentContainer/PieceElement.tsx b/meteor/client/ui/SegmentContainer/PieceElement.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { PieceExtended } from '../../../lib/Rundown'
+import { PieceExtended } from '../../lib/RundownResolver'
 import { pieceUiClassNames } from '../../lib/ui/pieceUiClassNames'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 
diff --git a/meteor/client/ui/SegmentContainer/PieceMultistepChevron.tsx b/meteor/client/ui/SegmentContainer/PieceMultistepChevron.tsx
@@ -1,6 +1,6 @@
 import { NoraContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React from 'react'
-import { PieceExtended } from '../../../lib/Rundown'
+import { PieceExtended } from '../../lib/RundownResolver'
 
 export const PieceMultistepChevron = React.forwardRef<
 	HTMLSpanElement,
diff --git a/meteor/client/ui/SegmentContainer/withResolvedSegment.ts b/meteor/client/ui/SegmentContainer/withResolvedSegment.ts
@@ -9,7 +9,7 @@ import {
 	PieceExtended,
 	PartExtended,
 	SegmentExtended,
-} from '../../../lib/Rundown'
+} from '../../lib/RundownResolver'
 import { IContextMenuContext } from '../RundownView'
 import { equalSets } from '../../../lib/lib'
 import { RundownUtils } from '../../lib/rundown'
diff --git a/meteor/client/ui/SegmentList/LinePart.tsx b/meteor/client/ui/SegmentList/LinePart.tsx
@@ -2,7 +2,7 @@ import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { literal } from '@sofie-automation/corelib/dist/lib'
 import classNames from 'classnames'
 import React, { useCallback, useState } from 'react'
-import { ISourceLayerExtended, PartExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended } from '../../lib/RundownResolver'
 import { contextMenuHoldToDisplayTime } from '../../lib/lib'
 import { RundownUtils } from '../../lib/rundown'
 import { getElementDocumentOffset } from '../../utils/positions'
diff --git a/meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx b/meteor/client/ui/SegmentList/LinePartMainPiece/LinePartMainPiece.tsx
@@ -1,6 +1,6 @@
 import { EvsContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React, { useMemo, useRef, useState } from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 // TODO: Move to a shared lib file
 import { PartId, PartInstanceId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import classNames from 'classnames'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx b/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartAdLibIndicator.tsx
@@ -2,7 +2,7 @@ import React, { useCallback, useMemo } from 'react'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { AdLibAction } from '@sofie-automation/corelib/dist/dataModel/AdlibAction'
 import { AdLibPiece } from '@sofie-automation/corelib/dist/dataModel/AdLibPiece'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 import { useSubscription, useTracker } from '../../../lib/ReactMeteorData/ReactMeteorData'
 import { LinePartIndicator } from './LinePartIndicator'
 import { useTranslation } from 'react-i18next'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx b/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartIndicator.tsx
@@ -1,7 +1,7 @@
 import classNames from 'classnames'
 import React, { useCallback, useEffect, useState } from 'react'
 import { UIStudio } from '../../../../lib/api/studios'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 import { RundownUtils } from '../../../lib/rundown'
 import { AdLibPieceUi } from '../../../lib/shelf'
 import { PieceUi } from '../../SegmentContainer/withResolvedSegment'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx b/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartPieceIndicator.tsx
@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react'
-import { ISourceLayerExtended, PieceExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended, PieceExtended } from '../../../lib/RundownResolver'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import StudioContext from '../../RundownView/StudioContext'
 import { LinePartIndicator } from './LinePartIndicator'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx b/meteor/client/ui/SegmentList/LinePartPieceIndicator/LinePartScriptPiece.tsx
@@ -1,6 +1,6 @@
 import { ScriptContent, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React, { useLayoutEffect, useMemo, useRef, useState } from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { IFloatingInspectorPosition } from '../../FloatingInspectors/IFloatingInspectorPosition'
 import { MicFloatingInspector } from '../../FloatingInspectors/MicFloatingInspector'
 
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx b/meteor/client/ui/SegmentList/LinePartPieceIndicator/PieceIndicatorMenu.tsx
@@ -1,6 +1,6 @@
 import React, { useEffect, useLayoutEffect, useState } from 'react'
 import Escape from './../../../lib/Escape'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
 import { usePopper } from 'react-popper'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
diff --git a/meteor/client/ui/SegmentList/LinePartPieceIndicators.tsx b/meteor/client/ui/SegmentList/LinePartPieceIndicators.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { ISourceLayerExtended, PieceExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended, PieceExtended } from '../../lib/RundownResolver'
 import { PartId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { LinePartAdLibIndicator } from './LinePartPieceIndicator/LinePartAdLibIndicator'
 import { LinePartPieceIndicator } from './LinePartPieceIndicator/LinePartPieceIndicator'
diff --git a/meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx b/meteor/client/ui/SegmentList/LinePartSecondaryPiece/LinePartSecondaryPiece.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames'
 import React, { CSSProperties, useCallback, useMemo, useRef, useState } from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { RundownUtils } from '../../../lib/rundown'
 import { PieceHoverInspector } from '../PieceHoverInspector'
 import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
diff --git a/meteor/client/ui/SegmentList/LinePartTimeline.tsx b/meteor/client/ui/SegmentList/LinePartTimeline.tsx
@@ -1,6 +1,6 @@
 import { PieceLifespan, SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React, { useMemo } from 'react'
-import { PartExtended, PieceExtended } from '../../../lib/Rundown'
+import { PartExtended, PieceExtended } from '../../lib/RundownResolver'
 import { findPieceExtendedToShowFromOrderedResolvedInstances } from '../PieceIcons/utils'
 import { LinePartMainPiece } from './LinePartMainPiece/LinePartMainPiece'
 import { OnAirLine } from './OnAirLine'
diff --git a/meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx b/meteor/client/ui/SegmentList/LinePartTransitionPiece/LinePartTransitionPiece.tsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 
 interface IProps {
 	piece: PieceExtended
diff --git a/meteor/client/ui/SegmentList/OnAirLine.tsx b/meteor/client/ui/SegmentList/OnAirLine.tsx
@@ -6,7 +6,7 @@ import {
 	withTiming,
 } from '../RundownView/RundownTiming/withTiming'
 import { SIMULATED_PLAYBACK_HARD_MARGIN } from '../SegmentTimeline/SegmentTimelineContainer'
-import { PartInstanceLimited } from '../../../lib/Rundown'
+import { PartInstanceLimited } from '../../lib/RundownResolver'
 import { useTranslation } from 'react-i18next'
 import { getAllowSpeaking, getAllowVibrating } from '../../lib/localStorage'
 import { CurrentPartRemaining } from '../RundownView/RundownTiming/CurrentPartRemaining'
diff --git a/meteor/client/ui/SegmentList/SegmentList.tsx b/meteor/client/ui/SegmentList/SegmentList.tsx
@@ -9,7 +9,7 @@ import { literal } from '@sofie-automation/corelib/dist/lib'
 import { isPartPlayable } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { LinePart } from './LinePart'
 import { unprotectString } from '@sofie-automation/corelib/dist/protectedString'
-import { ISourceLayerExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../lib/RundownResolver'
 import { SegmentViewMode } from '../SegmentContainer/SegmentViewModes'
 import { SegmentListHeader } from './SegmentListHeader'
 import { useInView } from 'react-intersection-observer'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPart.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPart.tsx
@@ -1,7 +1,7 @@
 import React, { useCallback, useEffect, useRef, useState } from 'react'
 import classNames from 'classnames'
 import { useTranslation } from 'react-i18next'
-import { PartExtended } from '../../../lib/Rundown'
+import { PartExtended } from '../../lib/RundownResolver'
 import { IOutputLayerUi, SegmentUi } from '../SegmentContainer/withResolvedSegment'
 import { StoryboardPartSecondaryPieces } from './StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces'
 import { StoryboardPartThumbnail } from './StoryboardPartThumbnail/StoryboardPartThumbnail'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardPartSecondaryPieces.tsx
@@ -1,6 +1,6 @@
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import React from 'react'
-import { ISourceLayerExtended, PartExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended } from '../../../lib/RundownResolver'
 import { getShowHiddenSourceLayers } from '../../../lib/localStorage'
 import { IOutputLayerUi } from '../../SegmentContainer/withResolvedSegment'
 import { StoryboardSourceLayer } from './StoryboardSourceLayer'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPartSecondaryPieces/StoryboardSourceLayer.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react'
 import classNames from 'classnames'
 // @ts-expect-error No types available
 import * as VelocityReact from 'velocity-react'
-import { ISourceLayerExtended, PartExtended, PieceExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended, PieceExtended } from '../../../lib/RundownResolver'
 import StudioContext from '../../RundownView/StudioContext'
 import { StoryboardSecondaryPiece } from './StoryboardSecondaryPiece'
 import { getCurrentTime } from '../../../../lib/lib'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnail.tsx
@@ -1,7 +1,7 @@
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
 import classNames from 'classnames'
 import React, { useEffect, useState } from 'react'
-import { PartExtended, PieceExtended } from '../../../../lib/Rundown'
+import { PartExtended, PieceExtended } from '../../../lib/RundownResolver'
 import { findPieceExtendedToShowFromOrderedResolvedInstances } from '../../PieceIcons/utils'
 import StudioContext from '../../RundownView/StudioContext'
 import { StoryboardPartThumbnailInner } from './StoryboardPartThumbnailInner'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPartThumbnail/StoryboardPartThumbnailInner.tsx
@@ -1,6 +1,6 @@
 import React, { useRef, useState } from 'react'
 import { ISourceLayer } from '@sofie-automation/blueprints-integration'
-import { PieceExtended } from '../../../../lib/Rundown'
+import { PieceExtended } from '../../../lib/RundownResolver'
 import { withMediaObjectStatus } from '../../SegmentTimeline/withMediaObjectStatus'
 import { getElementDocumentOffset, OffsetPosition } from '../../../utils/positions'
 import { getElementHeight, getElementWidth } from '../../../utils/dimensions'
diff --git a/meteor/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx b/meteor/client/ui/SegmentStoryboard/StoryboardPartTransitions.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { SourceLayerType } from '@sofie-automation/blueprints-integration'
-import { ISourceLayerExtended, PartExtended } from '../../../lib/Rundown'
+import { ISourceLayerExtended, PartExtended } from '../../lib/RundownResolver'
 import { IOutputLayerUi } from '../SegmentContainer/withResolvedSegment'
 import { StoryboardSourceLayer } from './StoryboardPartSecondaryPieces/StoryboardSourceLayer'
 
diff --git a/meteor/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx b/meteor/client/ui/SegmentTimeline/Parts/FlattenedSourceLayers.tsx
@@ -5,7 +5,7 @@ import { ISourceLayerUi } from '../SegmentTimelineContainer'
 import { ContextMenuTrigger } from '@jstarpl/react-contextmenu'
 import { SourceLayerItemContainer } from '../SourceLayerItemContainer'
 import { ISourceLayerPropsBase, useMouseContext } from './SourceLayer'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 
 interface IFlattenedSourceLayerProps extends ISourceLayerPropsBase {
 	layers: ISourceLayerUi[]
diff --git a/meteor/client/ui/SegmentTimeline/Parts/OutputGroup.tsx b/meteor/client/ui/SegmentTimeline/Parts/OutputGroup.tsx
@@ -1,6 +1,6 @@
 import React from 'react'
 import { DBRundownPlaylist } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
-import { ISourceLayerExtended } from '../../../../lib/Rundown'
+import { ISourceLayerExtended } from '../../../lib/RundownResolver'
 import { IContextMenuContext } from '../../RundownView'
 import { IOutputLayerUi, PartUi, PieceUi, SegmentUi } from '../SegmentTimelineContainer'
 import { FlattenedSourceLayers } from './FlattenedSourceLayers'
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx b/meteor/client/ui/SegmentTimeline/SegmentTimeline.tsx
@@ -42,7 +42,7 @@ import { UIStudio } from '../../../lib/api/studios'
 import { PartId, PartInstanceId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { RundownHoldState } from '@sofie-automation/corelib/dist/dataModel/RundownPlaylist'
 import { SegmentNoteCounts } from '../SegmentContainer/withResolvedSegment'
-import { PartExtended } from '../../../lib/Rundown'
+import { PartExtended } from '../../lib/RundownResolver'
 import {
 	withTiming,
 	TimingTickResolution,
diff --git a/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx b/meteor/client/ui/SegmentTimeline/SegmentTimelineContainer.tsx
diff --git a/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx b/meteor/client/ui/SegmentTimeline/SmallParts/SegmentTimelineSmallPartFlag.tsx
diff --git a/meteor/client/ui/Shelf/AdLibPanel.tsx b/meteor/client/ui/Shelf/AdLibPanel.tsx
diff --git a/meteor/client/ui/Shelf/SegmentTimingPanel.tsx b/meteor/client/ui/Shelf/SegmentTimingPanel.tsx
diff --git a/meteor/lib/adlibs.ts b/meteor/lib/adlibs.ts
diff --git a/meteor/lib/api/triggers/actionFilterChainCompilers.ts b/meteor/lib/api/triggers/actionFilterChainCompilers.ts
