remove directing mapping and use getFlexNameConversion to get the pipette load name

Author: shiyaochen

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MoveLiquidTools/LiquidClassesStepTools.tsx

@@ -11,12 +11,14 @@ import {
 import {
   getDisabledLiquidClasses,
   getSortedLiquidClassDefs,
-  PIPETTE_NAMES_MAP,
+  isFlexPipette,
 } from '@opentrons/shared-data'
+import { selectors as stepFormSelectors } from '../../../../../../step-forms'
 import { getLiquidEntities } from '../../../../../../step-forms/selectors'
 import { getLiquidClassDisplayName } from '../../../../../../liquid-defs/utils'
-import { selectors as stepFormSelectors } from '../../../../../../step-forms'
+import { getFlexNameConversion } from '../../../../../../file-data/selectors/utils'
 import type { ChangeEvent, Dispatch, SetStateAction } from 'react'
+import type { LiquidClassesOption } from '@opentrons/shared-data'
 import type { FieldPropsByName } from '../../types'
 import type { FormData } from '../../../../../../form-types'
 
@@ -35,7 +37,12 @@ export const LiquidClassesStepTools = ({
   const pipetteEntities = useSelector(stepFormSelectors.getPipetteEntities)
   const sortedLiquidClassDefs = getSortedLiquidClassDefs()
   const pipetteName = pipetteEntities[formData.pipette]?.name
-  const pipetteModel = PIPETTE_NAMES_MAP[pipetteName]
+  const pipetteSpec = pipetteEntities[formData.pipette]?.spec
+  const pipetteModel =
+    isFlexPipette(pipetteName) === true
+      ? getFlexNameConversion(pipetteSpec)
+      : pipetteName
+
   const { volume, tipRack, pipette, path } = formData
   const disabledLiquidClasses = getDisabledLiquidClasses(
     {
@@ -137,7 +144,7 @@ export const LiquidClassesStepTools = ({
                 align: 'vertical',
               }}
               largeDesktopBorderRadius
-              disabled={disabledLiquidClasses?.has(name)}
+              disabled={disabledLiquidClasses?.has(name as LiquidClassesOption)}
             />
           )
         })}

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/StepTools/MoveLiquidTools/__tests__/LiquidClassesStepTools.test.tsx

@@ -44,7 +44,7 @@ describe('LiquidClassesStepMoveLiquidTools', () => {
     vi.mocked(getPipetteEntities).mockReturnValue({
       [pipetteId]: {
         name: 'p50_single_flex',
-        spec: {} as any,
+        spec: { channels: 1, liquids: { default: { maxVolume: 50 } } } as any,
         id: pipetteId,
         tiprackLabwareDef: [],
         tiprackDefURI: ['mockDefURI1', 'mockDefURI2'],

protocol-designer/src/steplist/formLevel/test/warnings.test.ts

@@ -339,14 +339,18 @@ describe('Max dispense well volume', () => {
 
 describe('Incompatible liquid classes', () => {
   let fieldsWithPipette: {
-    pipette: { name: string }
+    pipette: {
+      name: string
+      spec: { channels: number; liquids: { default: { maxVolume: number } } }
+    }
     path: string
     tipRack: string
   }
   beforeEach(() => {
     fieldsWithPipette = {
       pipette: {
         name: 'p50_single_flex',
+        spec: { channels: 1, liquids: { default: { maxVolume: 50 } } },
       },
       path: 'multiDispense',
       tipRack: 'opentrons/opentrons_flex_96_tiprack_50ul/1',

protocol-designer/src/steplist/formLevel/warnings.tsx

@@ -2,8 +2,9 @@ import {
   MIN_LIQUID_CLASSES_COMPATIBLE_VOLUME,
   getIncompatibleLiquidClasses,
   getWellTotalVolume,
-  PIPETTE_NAMES_MAP,
+  isFlexPipette,
 } from '@opentrons/shared-data'
+import { getFlexNameConversion } from '../../file-data/selectors/utils'
 import type { LabwareDefinition2, PipetteName } from '@opentrons/shared-data'
 import type { FormError } from './errors'
 
@@ -196,8 +197,11 @@ export const incompatiblePipettePath = (
   const { pipette, tipRack, path } = fields
   if (!pipette) return null
   const pipetteName = pipette.name as PipetteName
+  const pipetteModel =
+    isFlexPipette(pipetteName) === true
+      ? getFlexNameConversion(pipette.spec)
+      : pipetteName
 
-  const pipetteModel = PIPETTE_NAMES_MAP[pipetteName]
   if (path === 'multiDispense') {
     const incompatiblePath = getIncompatibleLiquidClasses(pipetteModel, p =>
       p.byTipType.some(
@@ -218,7 +222,10 @@ export const incompatiblePipetteTiprack = (
   if (!pipette) return null
   const pipetteName = pipette.name as PipetteName
 
-  const pipetteModel = PIPETTE_NAMES_MAP[pipetteName]
+  const pipetteModel =
+    isFlexPipette(pipetteName) === true
+      ? getFlexNameConversion(pipette.spec)
+      : pipetteName
 
   const incompatiblePipette = getIncompatibleLiquidClasses(pipetteModel)
   const incompatibleTiprack = getIncompatibleLiquidClasses(pipetteModel, p =>

shared-data/js/constants.ts

@@ -1,5 +1,4 @@
 import type { CutoutFixtureId, CutoutId, AddressableAreaName } from '../deck'
-import type { PipetteName } from './pipettes'
 import type { ModuleModel, ModuleType } from './types'
 
 // constants for dealing with robot coordinate system (eg in labwareTools)
@@ -665,25 +664,3 @@ export const WELL_BOTTOM: 'well-bottom' = 'well-bottom'
 export const LIQUID_MENISCUS: 'liquid-meniscus' = 'liquid-meniscus'
 
 export const MIN_LIQUID_CLASSES_COMPATIBLE_VOLUME = 10
-
-export const PIPETTE_NAMES_MAP: Record<PipetteName, string> = {
-  p10_single: 'p10_single',
-  p10_multi: 'p10_multi',
-  p20_single_gen2: 'p20_single_gen2',
-  p20_multi_gen2: 'p20_multi_gen2',
-  p50_single: 'p50_single',
-  p50_multi: 'p50_multi',
-  p50_single_flex: 'flex_1channel_50',
-  p50_multi_flex: 'flex_8channel_50',
-  p300_single: 'p300_single',
-  p300_multi: 'p300_multi',
-  p300_single_gen2: 'p300_single_gen2',
-  p300_multi_gen2: 'p300_multi_gen2',
-  p1000_single: 'p1000_single',
-  p1000_single_gen2: 'p1000_single_gen2',
-  p1000_single_flex: 'flex_1channel_1000',
-  p1000_multi_flex: 'flex_8channel_1000',
-  p1000_multi_em_flex: 'flex_8channel_1000_em',
-  p1000_96: 'flex_96channel_1000',
-  p200_96: 'flex_96channel_200',
-}

shared-data/js/helpers/index.ts

@@ -437,7 +437,7 @@ export const getSortedLiquidClassDefs = (): Record<string, LiquidClass> => {
 
 export const getIncompatibleLiquidClasses = (
   pipetteModel: string,
-  additionalFilter?: (p: any) => boolean
+  additionalFilter?: (p: any) => boolean | null
 ): LiquidClassesOption[] => {
   const liquidClassDefs = getAllLiquidClassDefs()
 
@@ -447,7 +447,7 @@ export const getIncompatibleLiquidClasses = (
         !liquidClass.byPipette?.some(
           p =>
             p.pipetteModel === pipetteModel &&
-            (additionalFilter ? additionalFilter(p) : true)
+            (additionalFilter != null ? additionalFilter(p) : true)
         )
     )
     .map(liquidClass => liquidClass.displayName)