clean up LabwareSelectionModal logic

Opentrons · Oct 18, 2023 · c2a8c9d · c2a8c9d
1 parent be731ef
commit c2a8c9d
Showing 1 changed file with 25 additions and 20 deletions.
diff --git a/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.tsx b/protocol-designer/src/components/LabwareSelectionModal/LabwareSelectionModal.tsx
@@ -126,6 +126,7 @@ export const LabwareSelectionModal = (props: Props): JSX.Element | null => {
     has96Channel,
   } = props
   const defs = getOnlyLatestDefs()
+  const URIs = Object.keys(defs)
   const [selectedCategory, setSelectedCategory] = React.useState<string | null>(
     null
   )
@@ -233,6 +234,21 @@ export const LabwareSelectionModal = (props: Props): JSX.Element | null => {
     return `Slot ${slot} Labware`
   }
 
+  const getLabwareAdapterItem = (index: number, labwareDefUri?: string) => {
+    const labwareDef = labwareDefUri != null ? defs[labwareDefUri] : null
+    return labwareDef != null ? (
+      <LabwareItem
+        key={`${labwareDef.parameters.loadName}_${index}`}
+        icon="check-decagram"
+        labwareDef={labwareDef}
+        selectLabware={selectLabware}
+        onMouseEnter={() => setPreviewedLabware(labwareDef)}
+        // @ts-expect-error(sa, 2021-6-22): setPreviewedLabware expects an argument (even if nullsy)
+        onMouseLeave={() => setPreviewedLabware()}
+      />
+    ) : null
+  }
+
   const customLabwareURIs: string[] = React.useMemo(
     () => Object.keys(customLabwareDefs),
     [customLabwareDefs]
@@ -347,6 +363,7 @@ export const LabwareSelectionModal = (props: Props): JSX.Element | null => {
       moduleCompatibility = 'notCompatible'
     }
   }
+
   return (
     <>
       <Portal>
@@ -432,31 +449,19 @@ export const LabwareSelectionModal = (props: Props): JSX.Element | null => {
               onClick={makeToggleCategory(adapterCompatibleLabware)}
               inert={false}
             >
-              {has96Channel
-                ? permittedTipracks
+              {has96Channel && adapterLoadName === ADAPTER_96_CHANNEL
+                ? permittedTipracks.map((tiprackDefUri, index) => {
+                    const labwareDefUri = URIs.find(
+                      defUri => defUri === tiprackDefUri
+                    )
+                    return getLabwareAdapterItem(index, labwareDefUri)
+                  })
                 : getLabwareCompatibleWithAdapter(adapterLoadName).map(
                     (adapterDefUri, index) => {
-                      const latestDefs = getOnlyLatestDefs()
-
-                      const URIs = Object.keys(latestDefs)
                       const labwareDefUri = URIs.find(
                         defUri => defUri === adapterDefUri
                       )
-                      const labwareDef = labwareDefUri
-                        ? latestDefs[labwareDefUri]
-                        : null
-
-                      return labwareDef != null ? (
-                        <LabwareItem
-                          key={index}
-                          icon="check-decagram"
-                          labwareDef={labwareDef}
-                          selectLabware={selectLabware}
-                          onMouseEnter={() => setPreviewedLabware(labwareDef)}
-                          // @ts-expect-error(sa, 2021-6-22): setPreviewedLabware expects an argument (even if nullsy)
-                          onMouseLeave={() => setPreviewedLabware()}
-                        />
-                      ) : null
+                      return getLabwareAdapterItem(index, labwareDefUri)
                     }
                   )}
             </PDTitledList>