fix: incorrect peripheraldevice settings object

Julusian · Julusian · commit 0415798cc674 · 2024-12-09T17:33:41.000Z
diff --git a/meteor/server/publications/peripheralDeviceForDevice.ts b/meteor/server/publications/peripheralDeviceForDevice.ts
@@ -68,7 +68,8 @@ export function convertPeripheralDeviceForGateway(
 			const allDeviceSettingsInStudio = applyAndValidateOverrides(
 				studio.peripheralDeviceSettings.deviceSettings
 			).obj
-			deviceSettings = allDeviceSettingsInStudio[peripheralDevice.studioAndConfigId.configId] ?? deviceSettings
+			deviceSettings =
+				allDeviceSettingsInStudio[peripheralDevice.studioAndConfigId.configId]?.options ?? deviceSettings
 		}
 
 		switch (peripheralDevice.category) {
@@ -116,6 +117,8 @@ export function convertPeripheralDeviceForGateway(
 		}
 	}
 
+	console.log('got', peripheralDevice._id, deviceSettings)
+
 	return literal<Complete<PeripheralDeviceForDevice>>({
 		_id: peripheralDevice._id,
 		studioId: peripheralDevice.studioAndConfigId?.studioId,

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,8 @@ export function convertPeripheralDeviceForGateway(`
`68`	`68`	`const allDeviceSettingsInStudio = applyAndValidateOverrides(`
`69`	`69`	`studio.peripheralDeviceSettings.deviceSettings`
`70`	`70`	`).obj`
`71`		`- deviceSettings = allDeviceSettingsInStudio[peripheralDevice.studioAndConfigId.configId] ?? deviceSettings`
	`71`	`+ deviceSettings =`
	`72`	`+ allDeviceSettingsInStudio[peripheralDevice.studioAndConfigId.configId]?.options ?? deviceSettings`
`72`	`73`	`}`
`73`	`74`
`74`	`75`	`switch (peripheralDevice.category) {`
`@@ -116,6 +117,8 @@ export function convertPeripheralDeviceForGateway(`
`116`	`117`	`}`
`117`	`118`	`}`
`118`	`119`
	`120`	`+ console.log('got', peripheralDevice._id, deviceSettings)`
	`121`	`+`
`119`	`122`	`return literal<Complete<PeripheralDeviceForDevice>>({`
`120`	`123`	`_id: peripheralDevice._id,`
`121`	`124`	`studioId: peripheralDevice.studioAndConfigId?.studioId,`