clean up types and test

Opentrons · Dec 17, 2024 · b583dd9 · b583dd9
1 parent 997baec
commit b583dd9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/protocol-designer/src/labware-ingred/types.ts b/protocol-designer/src/labware-ingred/types.ts
@@ -30,8 +30,8 @@ export type OrderedLiquids = Array<{
 }>
 // TODO: Ian 2018-10-15 audit & rename these confusing types
 export interface LiquidGroup {
-  name: string | null | undefined
-  description: string | null | undefined
+  name: string | null
+  description: string | null
   displayColor: string
   liquidClass: string | null
   serialize: boolean

diff --git a/protocol-designer/src/liquid-defs/utils.ts b/protocol-designer/src/liquid-defs/utils.ts
@@ -7,5 +7,9 @@ export const getLiquidClassDisplayName = (
   if (liquidClass == null) {
     return null
   }
-  return liquidClassDefs[liquidClass]?.displayName ?? null
+  if (!(liquidClass in liquidClassDefs)) {
+    console.warn(`Liquid class ${liquidClass} not found`)
+    return null
+  }
+  return liquidClassDefs[liquidClass].displayName
 }
diff --git a/protocol-designer/src/organisms/DefineLiquidsModal/index.tsx b/protocol-designer/src/organisms/DefineLiquidsModal/index.tsx
@@ -45,9 +45,9 @@ import type { LiquidGroup } from '../../labware-ingred/types'
 interface LiquidEditFormValues {
   name: string
   displayColor: string
-  description?: string | null
-  liquidClass: string | null
-  serialize?: boolean
+  description: string
+  liquidClass: string
+  serialize: boolean
   [key: string]: unknown
 }
 
@@ -144,7 +144,7 @@ export function DefineLiquidsModal(
       name: values.name,
       displayColor: values.displayColor,
       liquidClass: values.liquidClass ? values.liquidClass : null,
-      description: values.description ?? null,
+      description: values.description ? values.description : null,
       serialize: values.serialize ?? false,
     })
   }

diff --git a/protocol-designer/src/pages/ProtocolOverview/LiquidDefinitions.tsx b/protocol-designer/src/pages/ProtocolOverview/LiquidDefinitions.tsx
@@ -65,6 +65,7 @@ export function LiquidDefinitions({
       <Flex flexDirection={DIRECTION_COLUMN} gridGap={SPACING.spacing4}>
         {Object.keys(allIngredientGroupFields).length > 0 ? (
           Object.values(allIngredientGroupFields).map((liquid, index) => {
+            console.log(getLiquidDescription(liquid, enableLiquidClasses))
             return (
               <ListItem
                 type="noActive"

diff --git a/protocol-designer/src/pages/ProtocolOverview/__tests__/LiquidDefinitions.test.tsx b/protocol-designer/src/pages/ProtocolOverview/__tests__/LiquidDefinitions.test.tsx
@@ -39,7 +39,7 @@ const mockAllIngredientGroupFields = {
     name: 'Amplicon PCR sample + AMPure XP beads',
     displayColor: '#9dffd8',
     description: '25µl Amplicon PCR + 20 µl AMPure XP beads',
-    liquidClass: null,
+    liquidClass: 'Water',
     serialize: false,
     liquidGroupId: '2',
   },