fix: buckets gone from the UI

Author: ianshade

meteor/server/publications/buckets.ts

@@ -6,6 +6,9 @@ import { check, Match } from 'meteor/check'
 import { StudioId, BucketId, ShowStyleVariantId } from '@sofie-automation/corelib/dist/dataModel/Ids'
 import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
 import { triggerWriteAccessBecauseNoCheckNecessary } from '../security/securityVerify'
+import { MongoQuery } from '@sofie-automation/corelib/dist/mongo'
+import { BucketAdLib } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibPiece'
+import { BucketAdLibAction } from '@sofie-automation/corelib/dist/dataModel/BucketAdLibAction'
 
 meteorPublish(
 	CorelibPubSub.buckets,
@@ -19,13 +22,12 @@ meteorPublish(
 			fields: {},
 		}
 
-		return Buckets.findWithCursor(
-			{
-				_id: bucketId ?? undefined,
-				studioId,
-			},
-			modifier
-		)
+		const selector: MongoQuery<Bucket> = {
+			studioId,
+		}
+		if (bucketId) selector._id = bucketId
+
+		return Buckets.findWithCursor(selector, modifier)
 	}
 )
 
@@ -38,20 +40,19 @@ meteorPublish(
 
 		triggerWriteAccessBecauseNoCheckNecessary()
 
-		return BucketAdLibs.findWithCursor(
-			{
-				studioId: studioId,
-				bucketId: bucketId ?? undefined,
-				showStyleVariantId: {
-					$in: [null, ...showStyleVariantIds], // null = valid for all variants
-				},
+		const selector: MongoQuery<BucketAdLib> = {
+			studioId: studioId,
+			showStyleVariantId: {
+				$in: [null, ...showStyleVariantIds], // null = valid for all variants
 			},
-			{
-				fields: {
-					ingestInfo: 0, // This is a large blob, and is not of interest to the UI
-				},
-			}
-		)
+		}
+		if (bucketId) selector.bucketId = bucketId
+
+		return BucketAdLibs.findWithCursor(selector, {
+			fields: {
+				ingestInfo: 0, // This is a large blob, and is not of interest to the UI
+			},
+		})
 	}
 )
 
@@ -64,19 +65,18 @@ meteorPublish(
 
 		triggerWriteAccessBecauseNoCheckNecessary()
 
-		return BucketAdLibActions.findWithCursor(
-			{
-				studioId: studioId,
-				bucketId: bucketId ?? undefined,
-				showStyleVariantId: {
-					$in: [null, ...showStyleVariantIds], // null = valid for all variants
-				},
+		const selector: MongoQuery<BucketAdLibAction> = {
+			studioId: studioId,
+			showStyleVariantId: {
+				$in: [null, ...showStyleVariantIds], // null = valid for all variants
+			},
+		}
+		if (bucketId) selector.bucketId = bucketId
+
+		return BucketAdLibActions.findWithCursor(selector, {
+			fields: {
+				ingestInfo: 0, // This is a large blob, and is not of interest to the UI
 			},
-			{
-				fields: {
-					ingestInfo: 0, // This is a large blob, and is not of interest to the UI
-				},
-			}
-		)
+		})
 	}
 )