wip: missed references

Julusian · Julusian · commit a4439e96b3e3 · 2024-11-19T15:27:48.000Z
diff --git a/meteor/server/api/packageManager.ts b/meteor/server/api/packageManager.ts
@@ -16,7 +16,7 @@ export async function abortExpectation(deviceId: PeripheralDeviceId, workId: str
 
 export async function restartAllExpectationsInStudio(studioId: StudioId): Promise<void> {
 	const packageManagerDevices = await PeripheralDevices.findFetchAsync({
-		studioId: studioId,
+		'studioAndConfigId.studioId': studioId,
 		category: PeripheralDeviceCategory.PACKAGE_MANAGER,
 		type: PeripheralDeviceType.PACKAGE_MANAGER,
 		subType: PERIPHERAL_SUBTYPE_PROCESS,
diff --git a/meteor/server/api/rest/v1/studios.ts b/meteor/server/api/rest/v1/studios.ts
@@ -134,7 +134,11 @@ class StudiosServerAPI implements StudiosRestAPI {
 			}
 		}
 
-		await PeripheralDevices.updateAsync({ studioId }, { $unset: { studioId: 1 } }, { multi: true })
+		await PeripheralDevices.updateAsync(
+			{ 'studioAndConfigId.studioId': studioId },
+			{ $unset: { studioAndConfigId: 1 } },
+			{ multi: true }
+		)
 
 		const rundownPlaylists = (await RundownPlaylists.findFetchAsync(
 			{ studioId },
@@ -198,7 +202,7 @@ class StudiosServerAPI implements StudiosRestAPI {
 		studioId: StudioId
 	): Promise<ClientAPI.ClientResponse<Array<{ id: string }>>> {
 		const peripheralDevices = (await PeripheralDevices.findFetchAsync(
-			{ studioId },
+			{ 'studioAndConfigId.studioId': studioId },
 			{ projection: { _id: 1 } }
 		)) as Array<Pick<PeripheralDevice, '_id'>>
 
diff --git a/meteor/server/api/snapshot.ts b/meteor/server/api/snapshot.ts
@@ -184,7 +184,7 @@ async function createSystemSnapshot(
 	queryRundownLayouts = { showStyleBaseId: { $in: showStyleBaseIds } }
 	queryTriggeredActions = { showStyleBaseIds: { $in: [null, ...showStyleBaseIds] } }
 
-	if (studioId) queryDevices = { studioId: studioId }
+	if (studioId) queryDevices = { 'studioAndConfigId.studioId': studioId }
 	else if (organizationId) queryDevices = { organizationId: organizationId }
 
 	const [showStyleVariants, rundownLayouts, devices, triggeredActions] = await Promise.all([
@@ -623,7 +623,7 @@ async function restoreFromSystemSnapshot(snapshot: SystemSnapshot): Promise<void
 			snapshot.blueprints ? saveIntoDb(Blueprints, {}, snapshot.blueprints) : null,
 			snapshot.rundownLayouts ? saveIntoDb(RundownLayouts, {}, snapshot.rundownLayouts) : null,
 			snapshot.triggeredActions ? saveIntoDb(TriggeredActions, {}, snapshot.triggeredActions) : null,
-			saveIntoDb(PeripheralDevices, studioId ? { studioId: studioId } : {}, snapshot.devices),
+			saveIntoDb(PeripheralDevices, studioId ? { 'studioAndConfigId.studioId': studioId } : {}, snapshot.devices),
 			saveIntoDb(CoreSystem, {}, [snapshot.coreSystem]),
 		]))
 	)
diff --git a/meteor/server/api/studio/api.ts b/meteor/server/api/studio/api.ts
@@ -90,7 +90,10 @@ async function removeStudio(context: MethodContext, studioId: StudioId): Promise
 			`Can't remove studio "${studioId}", because the rundownPlaylist "${playlist._id}" is in it.`
 		)
 
-	const peripheralDevice = await PeripheralDevices.findOneAsync({ studioId: studio._id }, { fields: { _id: 1 } })
+	const peripheralDevice = await PeripheralDevices.findOneAsync(
+		{ 'studioAndConfigId.studioId': studio._id },
+		{ fields: { _id: 1 } }
+	)
 	if (peripheralDevice)
 		throw new Meteor.Error(
 			404,
diff --git a/meteor/server/publications/peripheralDevice.ts b/meteor/server/publications/peripheralDevice.ts
@@ -49,7 +49,7 @@ meteorPublish(CorelibPubSub.peripheralDevicesAndSubDevices, async function (stud
 	triggerWriteAccessBecauseNoCheckNecessary()
 
 	const selector: MongoQuery<PeripheralDevice> = {
-		studioId,
+		'studioAndConfigId.studioId': studioId,
 	}
 
 	// TODO - this is not correctly reactive when changing the `studioId` property of a parent device
diff --git a/meteor/server/systemStatus/systemStatus.ts b/meteor/server/systemStatus/systemStatus.ts
@@ -248,7 +248,7 @@ export async function getSystemStatus(_cred: RequestCredentials | null, studioId
 	if (studioId) {
 		// Check status for a certain studio:
 
-		devices = await PeripheralDevices.findFetchAsync({ studioId: studioId })
+		devices = await PeripheralDevices.findFetchAsync({ 'studioAndConfigId.studioId': studioId })
 	} else {
 		// Check status for all studios:
 
diff --git a/packages/job-worker/src/__mocks__/presetCollections.ts b/packages/job-worker/src/__mocks__/presetCollections.ts
@@ -420,8 +420,10 @@ export async function setupMockPeripheralDevice(
 		name: 'mockDevice',
 		deviceName: 'Mock Gateway',
 		organizationId: null,
-		studioId: context.studioId,
-		settings: {},
+		studioAndConfigId: {
+			studioId: context.studioId,
+			configId: 'test',
+		},
 		nrcsName: category === PeripheralDeviceCategory.INGEST ? 'JEST-NRCS' : undefined,
 
 		category: category,
diff --git a/packages/job-worker/src/events/handle.ts b/packages/job-worker/src/events/handle.ts
@@ -256,7 +256,7 @@ export async function handleNotifyCurrentlyPlayingPart(
 	}
 	const parentDevice = await context.directCollections.PeripheralDevices.findOne({
 		_id: device.parentDeviceId,
-		studioId: context.studioId,
+		'studioAndConfigId.studioId': context.studioId,
 		parentDeviceId: { $exists: false },
 	})
 	if (!parentDevice) {
diff --git a/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts b/packages/job-worker/src/playout/model/implementation/LoadPlayoutModel.ts
@@ -45,7 +45,7 @@ export async function loadPlayoutModelPreInit(
 	}
 
 	const [PeripheralDevices, Playlist, Rundowns] = await Promise.all([
-		context.directCollections.PeripheralDevices.findFetch({ studioId: tmpPlaylist.studioId }),
+		context.directCollections.PeripheralDevices.findFetch({ 'studioAndConfigId.studioId': tmpPlaylist.studioId }),
 		reloadPlaylist ? context.directCollections.RundownPlaylists.findOne(tmpPlaylist._id) : clone(tmpPlaylist),
 		context.directCollections.Rundowns.findFetch({ playlistId: tmpPlaylist._id }),
 	])
@@ -120,7 +120,7 @@ async function loadInitData(
 	existingRundowns: ReadonlyDeep<DBRundown[]> | undefined
 ): Promise<[ReadonlyDeep<PeripheralDevice[]>, DBRundownPlaylist, ReadonlyDeep<DBRundown[]>]> {
 	const [peripheralDevices, reloadedPlaylist, rundowns] = await Promise.all([
-		context.directCollections.PeripheralDevices.findFetch({ studioId: tmpPlaylist.studioId }),
+		context.directCollections.PeripheralDevices.findFetch({ 'studioAndConfigId.studioId': tmpPlaylist.studioId }),
 		reloadPlaylist
 			? await context.directCollections.RundownPlaylists.findOne(tmpPlaylist._id)
 			: clone<DBRundownPlaylist>(tmpPlaylist),
diff --git a/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts b/packages/job-worker/src/studio/model/StudioPlayoutModelImpl.ts
@@ -177,7 +177,7 @@ export async function loadStudioPlayoutModel(
 	const studioId = context.studioId
 
 	const collections = await Promise.all([
-		context.directCollections.PeripheralDevices.findFetch({ studioId }),
+		context.directCollections.PeripheralDevices.findFetch({ 'studioAndConfigId.studioId': studioId }),
 		context.directCollections.RundownPlaylists.findFetch({ studioId }),
 		context.directCollections.Timelines.findOne(studioId),
 	])
diff --git a/packages/webui/src/client/lib/reactiveData/reactiveData.ts b/packages/webui/src/client/lib/reactiveData/reactiveData.ts
@@ -131,7 +131,7 @@ export namespace reactiveData {
 			const allDevices: PeripheralDevice[] = []
 			const peripheralDevices = PeripheralDevices.find(
 				{
-					studioId: studioId,
+					'studioAndConfigId.studioId': studioId,
 					ignore: {
 						$ne: true,
 					},
diff --git a/packages/webui/src/client/ui/RundownView.tsx b/packages/webui/src/client/ui/RundownView.tsx
@@ -1461,7 +1461,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 				PeripheralDevices.find({
 					parentDeviceId: {
 						$in: PeripheralDevices.find({
-							studioId: studio._id,
+							'studioAndConfigId.studioId': studio._id,
 						})
 							.fetch()
 							.map((i) => i._id),
@@ -2792,7 +2792,7 @@ const RundownViewContent = translateWithTracker<IPropsWithReady, IState, ITracke
 			}
 
 			const attachedPlayoutGateways = PeripheralDevices.find({
-				studioId: studio._id,
+				'studioAndConfigId.studioId': studio._id,
 				connected: true,
 				type: PeripheralDeviceType.PLAYOUT,
 			}).fetch()
diff --git a/packages/webui/src/client/ui/RundownView/RundownSystemStatus.tsx b/packages/webui/src/client/ui/RundownView/RundownSystemStatus.tsx
@@ -91,7 +91,7 @@ export const RundownSystemStatus = React.memo(
 		const parentDevices = useTracker(
 			() =>
 				PeripheralDevices.find({
-					studioId: props.studioId,
+					'studioAndConfigId.studioId': props.studioId,
 				}).fetch(),
 			[],
 			[]
diff --git a/packages/webui/src/client/ui/Settings/Studio/Devices/index.tsx b/packages/webui/src/client/ui/Settings/Studio/Devices/index.tsx
@@ -15,7 +15,7 @@ export function StudioDevices({ studioId }: Readonly<IStudioDevicesProps>): JSX.
 	const studioDevices = useTracker(
 		() =>
 			PeripheralDevices.find({
-				studioId: studioId,
+				'studioAndConfigId.studioId': studioId,
 			}).fetch(),
 		[studioId],
 		[]
diff --git a/packages/webui/src/client/ui/Settings/StudioSettings.tsx b/packages/webui/src/client/ui/Settings/StudioSettings.tsx
@@ -50,7 +50,7 @@ export default function StudioSettings(): JSX.Element {
 		() =>
 			PeripheralDevices.findOne(
 				{
-					studioId: {
+					'studioAndConfigId.studioId': {
 						$eq: studioId,
 					},
 					parentDeviceId: {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ meteorPublish(CorelibPubSub.peripheralDevicesAndSubDevices, async function (stud`
`49`	`49`	`triggerWriteAccessBecauseNoCheckNecessary()`
`50`	`50`
`51`	`51`	`const selector: MongoQuery<PeripheralDevice> = {`
`52`		`- studioId,`
	`52`	`+ 'studioAndConfigId.studioId': studioId,`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	// TODO - this is not correctly reactive when changing the `studioId` property of a parent device
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ export async function handleNotifyCurrentlyPlayingPart(`
`256`	`256`	`}`
`257`	`257`	`const parentDevice = await context.directCollections.PeripheralDevices.findOne({`
`258`	`258`	`_id: device.parentDeviceId,`
`259`		`- studioId: context.studioId,`
	`259`	`+ 'studioAndConfigId.studioId': context.studioId,`
`260`	`260`	`parentDeviceId: { $exists: false },`
`261`	`261`	`})`
`262`	`262`	`if (!parentDevice) {`