|
9 | 9 | PieceInstanceId, |
10 | 10 | RundownBaselineAdLibActionId, |
11 | 11 | RundownId, |
| 12 | + RundownPlaylistActivationId, |
12 | 13 | RundownPlaylistId, |
13 | 14 | SegmentId, |
14 | 15 | ShowStyleBaseId, |
@@ -259,26 +260,47 @@ function useMediaStatusSubscriptions( |
259 | 260 | let counter = 0 |
260 | 261 | readyStatus[counter++] = useSubscription(CorelibPubSub.rundownPlaylists, playlistIds, null) |
261 | 262 | readyStatus[counter++] = useSubscription(CorelibPubSub.rundownsInPlaylists, playlistIds) |
262 | | - const uiShowStyleBaseSubArguments = useMemo( |
263 | | - () => showStyleBaseIds.map((showStyleBaseId) => [showStyleBaseId] as [ShowStyleBaseId]), |
264 | | - [showStyleBaseIds] |
265 | | - ) |
266 | | - readyStatus[counter++] = useSubscriptions(MeteorPubSub.uiShowStyleBase, uiShowStyleBaseSubArguments) |
267 | 263 | readyStatus[counter++] = useSubscription(CorelibPubSub.segments, rundownIds, {}) |
268 | | - readyStatus[counter++] = useSubscription(CorelibPubSub.parts, rundownIds, null) |
269 | | - readyStatus[counter++] = useSubscription(CorelibPubSub.partInstancesSimple, rundownIds, null) |
270 | 264 | readyStatus[counter++] = useSubscription(CorelibPubSub.pieceInstancesSimple, rundownIds, null) |
271 | 265 | readyStatus[counter++] = useSubscription(CorelibPubSub.pieces, rundownIds, null) |
272 | 266 | readyStatus[counter++] = useSubscription(CorelibPubSub.adLibActions, rundownIds) |
273 | 267 | readyStatus[counter++] = useSubscription(CorelibPubSub.adLibPieces, rundownIds) |
274 | 268 | readyStatus[counter++] = useSubscription(CorelibPubSub.rundownBaselineAdLibActions, rundownIds) |
275 | 269 | readyStatus[counter++] = useSubscription(CorelibPubSub.rundownBaselineAdLibPieces, rundownIds) |
276 | 270 |
|
277 | | - const uiPieceContentStatusesSubArguments = useMemo( |
278 | | - () => playlistIds.map((playlistIds) => [playlistIds] as [RundownPlaylistId]), |
279 | | - [playlistIds] |
| 271 | + readyStatus[counter++] = useSubscriptions( |
| 272 | + MeteorPubSub.uiShowStyleBase, |
| 273 | + showStyleBaseIds.map((id) => [id]) |
| 274 | + ) |
| 275 | + readyStatus[counter++] = useSubscriptions( |
| 276 | + MeteorPubSub.uiParts, |
| 277 | + playlistIds.map((id) => [id]) |
| 278 | + ) |
| 279 | + readyStatus[counter++] = useSubscriptions( |
| 280 | + CorelibPubSub.uiPieceContentStatuses, |
| 281 | + playlistIds.map((id) => [id]) |
| 282 | + ) |
| 283 | + |
| 284 | + const playlistActivationIds = useTracker( |
| 285 | + () => |
| 286 | + RundownPlaylists.find( |
| 287 | + { |
| 288 | + _id: { |
| 289 | + $in: playlistIds, |
| 290 | + }, |
| 291 | + }, |
| 292 | + { projection: { activationId: 1 } } |
| 293 | + ) |
| 294 | + .fetch() |
| 295 | + .map((playlist) => playlist.activationId) |
| 296 | + .filter(Boolean) as RundownPlaylistActivationId[], |
| 297 | + [playlistIds], |
| 298 | + [] |
| 299 | + ) |
| 300 | + readyStatus[counter++] = useSubscriptions( |
| 301 | + MeteorPubSub.uiPartInstances, |
| 302 | + playlistActivationIds.map((id) => [id]) |
280 | 303 | ) |
281 | | - readyStatus[counter++] = useSubscriptions(CorelibPubSub.uiPieceContentStatuses, uiPieceContentStatusesSubArguments) |
282 | 304 |
|
283 | 305 | return readyStatus.reduce((mem, current) => mem && current, true) |
284 | 306 | } |
|
0 commit comments