feat: move notification publications into corelib

Author: justandras

meteor/server/publications/system.ts

@@ -5,6 +5,7 @@ import { RundownId, RundownPlaylistId, StudioId } from '@sofie-automation/coreli
 import { check } from 'meteor/check'
 import { SYSTEM_ID } from '@sofie-automation/meteor-lib/dist/collections/CoreSystem'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
+import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 
 meteorPublish(MeteorPubSub.coreSystem, async function (_token: string | undefined) {
 	triggerWriteAccessBecauseNoCheckNecessary()
@@ -26,7 +27,7 @@ meteorPublish(MeteorPubSub.coreSystem, async function (_token: string | undefine
 	})
 })
 
-meteorPublish(MeteorPubSub.notificationsForRundown, async function (studioId: StudioId, rundownId: RundownId) {
+meteorPublish(CorelibPubSub.notificationsForRundown, async function (studioId: StudioId, rundownId: RundownId) {
 	// HACK: This should do real auth
 	triggerWriteAccessBecauseNoCheckNecessary()
 
@@ -41,7 +42,7 @@ meteorPublish(MeteorPubSub.notificationsForRundown, async function (studioId: St
 })
 
 meteorPublish(
-	MeteorPubSub.notificationsForRundownPlaylist,
+	CorelibPubSub.notificationsForRundownPlaylist,
 	async function (studioId: StudioId, playlistId: RundownPlaylistId) {
 		// HACK: This should do real auth
 		triggerWriteAccessBecauseNoCheckNecessary()

packages/corelib/src/pubsub.ts

@@ -38,6 +38,7 @@ import { BlueprintId, BucketId, RundownPlaylistActivationId, SegmentId, ShowStyl
 import { PackageInfoDB } from './dataModel/PackageInfos.js'
 import { UIPieceContentStatus } from './dataModel/PieceContentStatus.js'
 import { Bucket } from './dataModel/Bucket.js'
+import { DBNotificationObj } from './dataModel/Notifications.js'
 
 /**
  * Ids of possible DDP subscriptions for any the UI and gateways accessing the Rundown & RundownPlaylist model.
@@ -130,6 +131,14 @@ export enum CorelibPubSub {
 	 * Fetch all Expected Package statuses in the specified Studios
 	 */
 	expectedPackageWorkStatuses = 'expectedPackageWorkStatuses',
+	/**
+	 * Fetch notifications for playlist
+	 */
+	notificationsForRundownPlaylist = 'notificationsForRundownPlaylist',
+	/**
+	 * Fetch notifications for rundown
+	 */
+	notificationsForRundown = 'notificationsForRundown',
 	/**
 	 * Fetch all Package container statuses in the specified Studios
 	 */
@@ -328,6 +337,11 @@ export interface CorelibPubSubTypes {
 		studioIds: StudioId[],
 		token?: string
 	) => CollectionName.PackageContainerStatuses
+	[CorelibPubSub.notificationsForRundown]: (studioId: StudioId, rundownId: RundownId) => CollectionName.Notifications
+	[CorelibPubSub.notificationsForRundownPlaylist]: (
+		studioId: StudioId,
+		playlistId: RundownPlaylistId
+	) => CollectionName.Notifications
 	[CorelibPubSub.packageInfos]: (deviceId: PeripheralDeviceId, token?: string) => CollectionName.PackageInfos
 
 	[CorelibPubSub.uiPieceContentStatuses]: (
@@ -345,6 +359,7 @@ export type CorelibPubSubCollections = {
 	[CollectionName.ExpectedPackages]: ExpectedPackageDBBase
 	[CollectionName.ExpectedPackageWorkStatuses]: ExpectedPackageWorkStatus
 	[CollectionName.ExternalMessageQueue]: ExternalMessageQueueObj
+	[CollectionName.Notifications]: DBNotificationObj
 	[CollectionName.NrcsIngestDataCache]: NrcsIngestDataCacheObj
 	[CollectionName.PartInstances]: DBPartInstance
 	[CollectionName.PackageContainerStatuses]: PackageContainerStatusDB

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

@@ -2,7 +2,6 @@ import {
 	BucketId,
 	OrganizationId,
 	PartId,
-	RundownId,
 	RundownPlaylistActivationId,
 	RundownPlaylistId,
 	ShowStyleBaseId,
@@ -33,7 +32,6 @@ import { CorelibPubSub, CorelibPubSubCollections, CorelibPubSubTypes } from '@so
 import { CollectionName } from '@sofie-automation/corelib/dist/dataModel/Collections'
 import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
 import { PartInstance } from '../collections/PartInstances.js'
-import type { DBNotificationObj } from '@sofie-automation/corelib/dist/dataModel/Notifications'
 
 /**
  * Ids of possible DDP subscriptions for the UI only
@@ -86,14 +84,6 @@ export enum MeteorPubSub {
 	 * Fetch all translation bundles
 	 */
 	translationsBundles = 'translationsBundles',
-	/**
-	 * Fetch notifications for playlist
-	 */
-	notificationsForRundownPlaylist = 'notificationsForRundownPlaylist',
-	/**
-	 * Fetch notifications for rundown
-	 */
-	notificationsForRundown = 'notificationsForRundown',
 
 	// custom publications:
 
@@ -186,11 +176,6 @@ export interface MeteorPubSubTypes {
 	) => CollectionName.RundownLayouts
 	[MeteorPubSub.organization]: (organizationId: OrganizationId | null, token?: string) => CollectionName.Organizations
 	[MeteorPubSub.translationsBundles]: (token?: string) => CollectionName.TranslationsBundles
-	[MeteorPubSub.notificationsForRundown]: (studioId: StudioId, rundownId: RundownId) => CollectionName.Notifications
-	[MeteorPubSub.notificationsForRundownPlaylist]: (
-		studioId: StudioId,
-		playlistId: RundownPlaylistId
-	) => CollectionName.Notifications
 
 	// custom publications:
 
@@ -258,7 +243,9 @@ export type MeteorPubSubCollections = {
 	[CollectionName.Buckets]: Bucket
 	[CollectionName.TranslationsBundles]: TranslationsBundle
 	[CollectionName.ExpectedPlayoutItems]: ExpectedPlayoutItem
-	[CollectionName.Notifications]: DBNotificationObj
+
+	[CollectionName.MediaWorkFlows]: MediaWorkFlow
+	[CollectionName.MediaWorkFlowSteps]: MediaWorkFlowStep
 } & MeteorPubSubCustomCollections
 
 export type MeteorPubSubCustomCollections = {

packages/webui/src/client/ui/RundownView/RundownViewSubscriptions.ts

@@ -116,7 +116,7 @@ export function useRundownViewSubscriptions(playlistId: RundownPlaylistId): bool
 
 	auxSubsReady.push(
 		useSubscriptionIfEnabled(
-			MeteorPubSub.notificationsForRundownPlaylist,
+			CorelibPubSub.notificationsForRundownPlaylist,
 			!!playlistId && !!playlistStudioId,
 			playlistStudioId || protectString(''),
 			playlistId
@@ -135,7 +135,7 @@ export function useRundownViewSubscriptions(playlistId: RundownPlaylistId): bool
 		).fetch() as Pick<DBRundown, '_id' | 'studioId'>[]
 
 		for (const rundown of rundowns) {
-			meteorSubscribe(MeteorPubSub.notificationsForRundown, rundown.studioId, rundown._id)
+			meteorSubscribe(CorelibPubSub.notificationsForRundown, rundown.studioId, rundown._id)
 		}
 	}, [playlistId])