Merge pull request Sofie-Automation#1398 from bbc/upstream/minishelf-in-all-views

feat: mini shelfview

Author: jstarpl

packages/webui/src/client/ui/SegmentList/SegmentListContainer.tsx

@@ -13,6 +13,7 @@ import { LIVELINE_HISTORY_SIZE as TIMELINE_LIVELINE_HISTORY_SIZE } from '../Segm
 import { Segments } from '../../collections'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { UIPartInstances, UIParts } from '../Collections'
+import { RundownViewShelf } from '../RundownView/RundownViewShelf'
 
 export const LIVELINE_HISTORY_SIZE = TIMELINE_LIVELINE_HISTORY_SIZE
 
@@ -189,25 +190,39 @@ export const SegmentListContainer = withResolvedSegment<IProps>(function Segment
 	// }, [subscriptionsReady, firstNonInvalidPart?.pieces.length])
 
 	return (
-		<SegmentList
-			id={props.id}
-			ref={segmentRef}
-			key={unprotectString(props.segmentui._id)}
-			segment={props.segmentui}
-			parts={props.parts}
-			playlist={props.playlist}
-			currentPartWillAutoNext={currentPartWillAutoNext}
-			segmentNoteCounts={props.segmentNoteCounts}
-			isLiveSegment={isLiveSegment}
-			isNextSegment={isNextSegment}
-			isQueuedSegment={props.playlist.queuedSegmentId === props.segmentui._id}
-			showCountdownToSegment={props.showCountdownToSegment}
-			fixedSegmentDuration={props.fixedSegmentDuration ?? false}
-			hasAlreadyPlayed={props.hasAlreadyPlayed}
-			onContextMenu={props.onContextMenu}
-			onSwitchViewMode={props.onSwitchViewMode}
-			onHeaderNoteClick={props.onHeaderNoteClick}
-			onPieceDoubleClick={props.onPieceDoubleClick}
-		/>
+		<>
+			<SegmentList
+				id={props.id}
+				ref={segmentRef}
+				key={unprotectString(props.segmentui._id)}
+				segment={props.segmentui}
+				parts={props.parts}
+				playlist={props.playlist}
+				currentPartWillAutoNext={currentPartWillAutoNext}
+				segmentNoteCounts={props.segmentNoteCounts}
+				isLiveSegment={isLiveSegment}
+				isNextSegment={isNextSegment}
+				isQueuedSegment={props.playlist.queuedSegmentId === props.segmentui._id}
+				showCountdownToSegment={props.showCountdownToSegment}
+				fixedSegmentDuration={props.fixedSegmentDuration ?? false}
+				hasAlreadyPlayed={props.hasAlreadyPlayed}
+				onContextMenu={props.onContextMenu}
+				onSwitchViewMode={props.onSwitchViewMode}
+				onHeaderNoteClick={props.onHeaderNoteClick}
+				onPieceDoubleClick={props.onPieceDoubleClick}
+			/>
+			{props.segmentui.showShelf && props.adLibSegmentUi && (
+				<RundownViewShelf
+					studio={props.studio}
+					segment={props.segmentui}
+					playlist={props.playlist}
+					showStyleBase={props.showStyleBase}
+					adLibSegmentUi={props.adLibSegmentUi}
+					hotkeyGroup={unprotectString(props.segmentui._id) + '_RundownViewShelf'}
+					miniShelfFilter={props.miniShelfFilter}
+					studioMode={props.studioMode}
+				/>
+			)}
+		</>
 	)
 })

packages/webui/src/client/ui/SegmentStoryboard/SegmentStoryboardContainer.tsx

@@ -17,6 +17,7 @@ import { MongoFieldSpecifierOnes } from '@sofie-automation/corelib/dist/mongo'
 import { PartInstance } from '@sofie-automation/meteor-lib/dist/collections/PartInstances'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { UIPartInstances, UIParts } from '../Collections'
+import { RundownViewShelf } from '../RundownView/RundownViewShelf'
 
 export const LIVELINE_HISTORY_SIZE = TIMELINE_LIVELINE_HISTORY_SIZE
 
@@ -201,36 +202,50 @@ export const SegmentStoryboardContainer = withResolvedSegment<IProps>(function S
 	}
 
 	return (
-		<SegmentStoryboard
-			id={props.id}
-			ref={segmentRef}
-			key={unprotectString(props.segmentui._id)}
-			segment={props.segmentui}
-			studio={props.studio}
-			parts={props.parts}
-			segmentNoteCounts={props.segmentNoteCounts}
-			onItemClick={props.onPieceClick}
-			onItemDoubleClick={props.onPieceDoubleClick}
-			playlist={props.playlist}
-			isLiveSegment={isLiveSegment}
-			isNextSegment={isNextSegment}
-			isQueuedSegment={props.playlist.queuedSegmentId === props.segmentui._id}
-			hasRemoteItems={props.hasRemoteItems}
-			hasGuestItems={props.hasGuestItems}
-			currentPartWillAutoNext={currentPartWillAutoNext}
-			hasAlreadyPlayed={props.hasAlreadyPlayed}
-			followLiveLine={props.followLiveSegments}
-			liveLineHistorySize={LIVELINE_HISTORY_SIZE}
-			displayLiveLineCounter={props.displayLiveLineCounter}
-			onContextMenu={props.onContextMenu}
-			onScroll={onScroll}
-			isLastSegment={props.isLastSegment}
-			lastValidPartIndex={props.lastValidPartIndex}
-			onHeaderNoteClick={props.onHeaderNoteClick}
-			onSwitchViewMode={props.onSwitchViewMode}
-			showCountdownToSegment={props.showCountdownToSegment}
-			fixedSegmentDuration={props.fixedSegmentDuration}
-			subscriptionsReady={initialSubscriptionsReady}
-		/>
+		<>
+			<SegmentStoryboard
+				id={props.id}
+				ref={segmentRef}
+				key={unprotectString(props.segmentui._id)}
+				segment={props.segmentui}
+				studio={props.studio}
+				parts={props.parts}
+				segmentNoteCounts={props.segmentNoteCounts}
+				onItemClick={props.onPieceClick}
+				onItemDoubleClick={props.onPieceDoubleClick}
+				playlist={props.playlist}
+				isLiveSegment={isLiveSegment}
+				isNextSegment={isNextSegment}
+				isQueuedSegment={props.playlist.queuedSegmentId === props.segmentui._id}
+				hasRemoteItems={props.hasRemoteItems}
+				hasGuestItems={props.hasGuestItems}
+				currentPartWillAutoNext={currentPartWillAutoNext}
+				hasAlreadyPlayed={props.hasAlreadyPlayed}
+				followLiveLine={props.followLiveSegments}
+				liveLineHistorySize={LIVELINE_HISTORY_SIZE}
+				displayLiveLineCounter={props.displayLiveLineCounter}
+				onContextMenu={props.onContextMenu}
+				onScroll={onScroll}
+				isLastSegment={props.isLastSegment}
+				lastValidPartIndex={props.lastValidPartIndex}
+				onHeaderNoteClick={props.onHeaderNoteClick}
+				onSwitchViewMode={props.onSwitchViewMode}
+				showCountdownToSegment={props.showCountdownToSegment}
+				fixedSegmentDuration={props.fixedSegmentDuration}
+				subscriptionsReady={initialSubscriptionsReady}
+			/>
+			{props.segmentui.showShelf && props.adLibSegmentUi && (
+				<RundownViewShelf
+					studio={props.studio}
+					segment={props.segmentui}
+					playlist={props.playlist}
+					showStyleBase={props.showStyleBase}
+					adLibSegmentUi={props.adLibSegmentUi}
+					hotkeyGroup={unprotectString(props.segmentui._id) + '_RundownViewShelf'}
+					miniShelfFilter={props.miniShelfFilter}
+					studioMode={props.studioMode}
+				/>
+			)}
+		</>
 	)
 })