Merge 'chore_release-pd-8.5.0' into 'edge', bumping 13.json -> 14.json

Author: ddcc4

protocol-designer/src/components/organisms/HardwareConfigurator/index.tsx

@@ -57,10 +57,16 @@ export function HardwareConfigurator(
       const hasModule = Object.values(modules).some(
         module => module.cutoutId === cutoutId
       )
+      //  since we are adding cutoutA1 in moduleConfig if
+      //  there is a TC
+      const hasTCAndCutoutA1 =
+        Object.values(modules).some(
+          module => module.type === THERMOCYCLER_MODULE_TYPE
+        ) && cutoutId === 'cutoutA1'
       const hasFixture = Object.values(fixtures).some(
         fixture => fixture.cutoutId === cutoutId
       )
-      return !hasModule && !hasFixture
+      return !hasModule && !hasFixture && !hasTCAndCutoutA1
     }
   )
   const moduleConfig: DeckConfiguration = Object.values(modules).flatMap(

protocol-designer/src/components/organisms/utils.ts

@@ -111,7 +111,7 @@ export const getLabwareCompatibleForEditHardware = (
     } else if (labwareDefB1 != null) {
       labwareCompatible = getLabwareIsCompatible(labwareDefB1, moduleType)
     } else {
-      labwareCompatible = false
+      labwareCompatible = true
     }
   } else if (labwareDef != null && moduleType != null) {
     labwareCompatible = getLabwareIsCompatible(labwareDef, moduleType)

shared-data/command/index.ts

@@ -5,9 +5,10 @@ import commandSchemaV10 from './schemas/10.json'
 import commandSchemaV11 from './schemas/11.json'
 import commandSchemaV12 from './schemas/12.json'
 import commandSchemaV13 from './schemas/13.json'
+import commandSchemaV14 from './schemas/14.json'
 
 export * from './types/index'
-export const commandSchemaLatest = commandSchemaV13
+export const commandSchemaLatest = commandSchemaV14
 
 export {
   commandSchemaV7,
@@ -17,4 +18,5 @@ export {
   commandSchemaV11,
   commandSchemaV12,
   commandSchemaV13,
+  commandSchemaV14,
 }