Merge pull request Sofie-Automation#1309 from bbc/upstream/fix-action-triggers-previews

fix: action trigger settings ui previews

Author: jstarpl

meteor/server/publications/partInstancesUI/publication.ts

@@ -1,9 +1,4 @@
-import {
-	PartInstanceId,
-	RundownId,
-	RundownPlaylistActivationId,
-	SegmentId,
-} from '@sofie-automation/corelib/dist/dataModel/Ids'
+import { PartInstanceId, RundownPlaylistActivationId, SegmentId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { check } from 'meteor/check'
 import {
 	CustomPublishCollection,
@@ -26,7 +21,6 @@ import { RundownsObserver } from '../lib/rundownsObserver'
 import { RundownContentObserver } from './rundownContentObserver'
 import { protectString } from '@sofie-automation/corelib/dist/protectedString'
 import { Match } from '../../lib/check'
-import { RundownReadAccess } from '../../security/rundown'
 import { DBPartInstance } from '@sofie-automation/corelib/dist/dataModel/PartInstance'
 import {
 	extractRanks,
@@ -37,7 +31,6 @@ import {
 
 interface UIPartInstancesArgs {
 	readonly playlistActivationId: RundownPlaylistActivationId
-	readonly rundownIds: RundownId[]
 }
 
 export interface UIPartInstancesState {
@@ -205,32 +198,26 @@ export async function manipulateUIPartInstancesPublicationData(
 meteorCustomPublish(
 	MeteorPubSub.uiPartInstances,
 	CustomCollectionName.UIPartInstances,
-	async function (pub, rundownIds: RundownId[], playlistActivationId: RundownPlaylistActivationId | null) {
-		check(rundownIds, [String])
+	async function (pub, playlistActivationId: RundownPlaylistActivationId | null) {
 		check(playlistActivationId, Match.Maybe(String))
 
 		const credentials = await resolveCredentials({ userId: this.userId, token: undefined })
 
-		if (
-			playlistActivationId &&
-			(!credentials ||
-				NoSecurityReadAccess.any() ||
-				(await RundownReadAccess.rundownContent({ $in: rundownIds }, credentials)))
-		) {
+		if (playlistActivationId && (!credentials || NoSecurityReadAccess.any())) {
 			await setUpCollectionOptimizedObserver<
 				Omit<DBPartInstance, PartInstanceOmitedFields>,
 				UIPartInstancesArgs,
 				UIPartInstancesState,
 				UIPartInstancesUpdateProps
 			>(
-				`pub_${MeteorPubSub.uiPartInstances}_${rundownIds.join(',')}_${playlistActivationId}`,
-				{ rundownIds, playlistActivationId },
+				`pub_${MeteorPubSub.uiPartInstances}_${playlistActivationId}`,
+				{ playlistActivationId },
 				setupUIPartInstancesPublicationObservers,
 				manipulateUIPartInstancesPublicationData,
 				pub
 			)
 		} else {
-			logger.warn(`Pub.uiPartInstances: Not allowed: [${rundownIds.join(',')}] "${playlistActivationId}"`)
+			logger.warn(`Pub.uiPartInstances: Not allowed:"${playlistActivationId}"`)
 		}
 	}
 )

meteor/server/publications/partsUI/publication.ts

@@ -190,15 +190,15 @@ export async function manipulateUIPartsPublicationData(
 meteorCustomPublish(
 	MeteorPubSub.uiParts,
 	CustomCollectionName.UIParts,
-	async function (pub, playlistId: RundownPlaylistId) {
+	async function (pub, playlistId: RundownPlaylistId | null) {
 		check(playlistId, String)
 
 		const credentials = await resolveCredentials({ userId: this.userId, token: undefined })
 
 		if (
 			!credentials ||
 			NoSecurityReadAccess.any() ||
-			(await RundownPlaylistReadAccess.rundownPlaylistContent(playlistId, credentials))
+			(playlistId && (await RundownPlaylistReadAccess.rundownPlaylistContent(playlistId, credentials)))
 		) {
 			await setUpCollectionOptimizedObserver<
 				Omit<DBPart, PartOmitedFields>,

packages/meteor-lib/src/api/pubsub.ts

@@ -2,7 +2,6 @@ import {
 	BucketId,
 	OrganizationId,
 	PartId,
-	RundownId,
 	RundownPlaylistActivationId,
 	RundownPlaylistId,
 	ShowStyleBaseId,
@@ -247,9 +246,8 @@ export interface MeteorPubSubTypes {
 		bucketId: BucketId
 	) => CustomCollectionName.UIBucketContentStatuses
 	[MeteorPubSub.uiBlueprintUpgradeStatuses]: () => CustomCollectionName.UIBlueprintUpgradeStatuses
-	[MeteorPubSub.uiParts]: (playlistId: RundownPlaylistId) => CustomCollectionName.UIParts
+	[MeteorPubSub.uiParts]: (playlistId: RundownPlaylistId | null) => CustomCollectionName.UIParts
 	[MeteorPubSub.uiPartInstances]: (
-		rundownIds: RundownId[],
 		playlistActivationId: RundownPlaylistActivationId | null
 	) => CustomCollectionName.UIPartInstances
 }

packages/webui/src/client/ui/ClockView/CameraScreen/index.tsx

@@ -100,7 +100,7 @@ export function CameraScreen({ playlist, studioId }: Readonly<IProps>): JSX.Elem
 	useSubscription(CorelibPubSub.segments, rundownIds, {})
 
 	const studioReady = useSubscription(MeteorPubSub.uiStudio, studioId)
-	useSubscription(MeteorPubSub.uiPartInstances, rundownIds, playlist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiPartInstances, playlist?.activationId ?? null)
 
 	useSubscription(CorelibPubSub.parts, rundownIds, null)
 

packages/webui/src/client/ui/ClockView/PresenterScreen.tsx

@@ -341,7 +341,7 @@ export function usePresenterScreenSubscriptions(props: PresenterScreenProps): vo
 
 	useSubscription(CorelibPubSub.segments, rundownIds, {})
 	useSubscription(CorelibPubSub.parts, rundownIds, null)
-	useSubscription(MeteorPubSub.uiPartInstances, rundownIds, playlist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiPartInstances, playlist?.activationId ?? null)
 	useSubscriptions(
 		MeteorPubSub.uiShowStyleBase,
 		showStyleBaseIds.map((id) => [id])

packages/webui/src/client/ui/Prompter/PrompterView.tsx

@@ -597,7 +597,7 @@ function Prompter(props: Readonly<PropsWithChildren<IPrompterProps>>): JSX.Eleme
 	const rundownIDs = playlist ? RundownPlaylistCollectionUtil.getRundownUnorderedIDs(playlist) : []
 	useSubscription(CorelibPubSub.segments, rundownIDs, {})
 	useSubscription(MeteorPubSub.uiParts, props.rundownPlaylistId)
-	useSubscription(MeteorPubSub.uiPartInstances, rundownIDs, playlist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiPartInstances, playlist?.activationId ?? null)
 	useSubscription(CorelibPubSub.pieces, rundownIDs, null)
 	useSubscription(CorelibPubSub.pieceInstancesSimple, rundownIDs, null)
 

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

@@ -1289,12 +1289,7 @@ export function RundownView(props: Readonly<IProps>): JSX.Element {
 	)
 	auxSubsReady.push(useSubscriptionIfEnabled(MeteorPubSub.uiParts, rundownIds.length > 0, playlistId))
 	auxSubsReady.push(
-		useSubscriptionIfEnabled(
-			MeteorPubSub.uiPartInstances,
-			rundownIds.length > 0,
-			rundownIds,
-			playlistActivationId ?? null
-		)
+		useSubscriptionIfEnabled(MeteorPubSub.uiPartInstances, !!playlistActivationId, playlistActivationId ?? null)
 	)
 
 	useTracker(() => {

packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionEntry.tsx

@@ -198,7 +198,7 @@ export const TriggeredActionEntry: React.FC<IProps> = React.memo(function Trigge
 			}
 			return [] as IWrappedAdLib[]
 		},
-		[selected, resolvedActions, sourceLayers],
+		[selected, resolvedActions, sourceLayers, previewContext],
 		[] as IWrappedAdLib[]
 	)
 

packages/webui/src/client/ui/Settings/components/triggeredActions/TriggeredActionsEditor.tsx

@@ -191,8 +191,8 @@ export const TriggeredActionsEditor: React.FC<IProps> = function TriggeredAction
 		null
 	)
 
-	useSubscription(MeteorPubSub.uiPartInstances, rundown ? [rundown._id] : [], rundownPlaylist?.activationId ?? null)
-	useSubscription(CorelibPubSub.parts, rundown ? [rundown._id] : [], null)
+	useSubscription(MeteorPubSub.uiPartInstances, rundownPlaylist?.activationId ?? null)
+	useSubscription(MeteorPubSub.uiParts, rundownPlaylist?._id ?? null)
 
 	const previewContext = useTracker(
 		() => {