wip

Author: Julusian

meteor/server/migration/X_X_X.ts

@@ -212,7 +212,7 @@ export const addSteps = addMigrationSteps(CURRENT_SYSTEM_VERSION, [
 		},
 		migrate: async () => {
 			const studios = await Studios.findFetchAsync({
-				'peripheralDeviceSettings.deviceSettings.defaults': { $exists: true },
+				'peripheralDeviceSettings.deviceSettings.defaults': { $exists: false },
 			})
 
 			for (const studio of studios) {

packages/corelib/src/dataModel/Studio.ts

@@ -195,12 +195,6 @@ export interface StudioPlayoutDevice {
 }
 
 export interface StudioDeviceSettings {
-	// /**
-	//  * The id of the gateway this is assigned to
-	//  * Future: This may be replaced with some other grouping or way of assigning devices
-	//  */
-	// peripheralDeviceId: PeripheralDeviceId | undefined
-
 	/**
 	 * User friendly name for the device
 	 */

packages/webui/src/client/ui/Settings/Studio/Devices/ParentDevices.tsx

@@ -400,13 +400,6 @@ function ParentDeviceEditRow({
 		<tr className="expando-details hl" key={item.id + '-details'}>
 			<td colSpan={99}>
 				<div className="properties-grid">
-					<AssignPeripheralDeviceConfigId
-						studioId={studioId}
-						configId={item.id}
-						value={peripheralDevice?._id}
-						peripheralDeviceOptions={peripheralDeviceOptions}
-					/>
-
 					<LabelAndOverrides
 						label={t('Name')}
 						item={item}
@@ -424,6 +417,13 @@ function ParentDeviceEditRow({
 						)}
 					</LabelAndOverrides>
 
+					<AssignPeripheralDeviceConfigId
+						studioId={studioId}
+						configId={item.id}
+						value={peripheralDevice?._id}
+						peripheralDeviceOptions={peripheralDeviceOptions}
+					/>
+
 					{!peripheralDevice && <p>{t('A device must be assigned to the config to edit the settings')}</p>}
 
 					{peripheralDevice && (