refactor(protocol-designer): show lid on deck view always (#18710)

closes AUTH-1911, AUTH-1945

Author: jerader

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

@@ -64,7 +64,7 @@ import {
   getLabwareIsRecommended,
   getStackerDefinition,
 } from '../../../pages/Designer/DeckSetup/utils'
-import { TC_LID_LOADNAME } from '../../../pages/Designer/utils'
+import { TIPRACK_LID_LOADNAME } from '../../../pages/Designer/utils'
 import { selectors as stepFormSelectors } from '../../../step-forms'
 import { getPipetteEntities } from '../../../step-forms/selectors'
 import { getHas96Channel } from '../../../utils'
@@ -118,6 +118,14 @@ export function SelectLabwareModal(
   const customLabwareDefs = useSelector(getCustomLabwareDefsByURI)
   const has96Channel = getHas96Channel(pipetteEntities)
   const defs = getOnlyLatestDefs()
+  const lidLoadNames = Object.values(defs)
+    .filter(
+      def =>
+        def.allowedRoles?.includes('lid') &&
+        def.parameters.loadName !== TIPRACK_LID_LOADNAME
+    )
+    ?.map(def => def.parameters.loadName)
+
   const deckSetup = useSelector(stepFormSelectors.getInitialDeckSetup)
   const zoomedInSlotInfo = useSelector(selectors.getZoomedInSlotInfo)
   const {
@@ -542,7 +550,7 @@ export function SelectLabwareModal(
                                     loadName={loadName}
                                     allowInputField={
                                       onFlexStacker ||
-                                      loadName === TC_LID_LOADNAME
+                                      lidLoadNames.includes(loadName)
                                     }
                                     stackingProps={stackingProps ?? undefined}
                                     id={`${index}_${category}_${loadName}`}
@@ -736,11 +744,10 @@ export function SelectLabwareModal(
                                                       nestedDef.parameters
                                                         .loadName
                                                     }
-                                                    allowInputField={
+                                                    allowInputField={lidLoadNames.includes(
                                                       nestedDef.parameters
-                                                        .loadName ===
-                                                      TC_LID_LOADNAME
-                                                    }
+                                                        .loadName
+                                                    )}
                                                     stackingProps={
                                                       stackingProps ?? undefined
                                                     }

protocol-designer/src/pages/Designer/DeckSetup/DeckSetupDetails.tsx

@@ -29,7 +29,6 @@ import {
   getStagingAreaAddressableAreas,
   getTopmostLabwareOnModuleFromStack,
 } from '../../../utils'
-import { getShowTCLid } from '../../ProtocolOverview/utils'
 import { HighlightLabware } from '../HighlightLabware'
 import { getSlotInformation } from '../utils'
 import { HighlightItems } from './HighlightItems'
@@ -429,8 +428,7 @@ export function DeckSetupDetails(props: DeckSetupDetailsProps): JSX.Element {
         if (
           getSlotInLocationStack(labware.stack) === 'offDeck' ||
           allModules.some(m => labware.stack.includes(m.id)) ||
-          labware.id === adjacentLabware?.id ||
-          getShowTCLid(labware)
+          labware.id === adjacentLabware?.id
         ) {
           return null
         }

protocol-designer/src/pages/Designer/utils.ts

@@ -4,6 +4,7 @@ import { reduce } from 'lodash'
 
 import {
   FLEX_ROBOT_TYPE,
+  getAllLabwareDefs,
   getIsTiprack,
   getPositionFromSlotId,
   TC_MODULE_LOCATION_OT2,
@@ -49,7 +50,6 @@ import type { Fixture } from './DeckSetup/constants'
 
 export const TIPRACK_LID_LOADNAME = 'opentrons_flex_tiprack_lid'
 export const TC_LID_LOADNAME = 'opentrons_tough_pcr_auto_sealing_lid'
-export const LID_LOADNAMES = [TIPRACK_LID_LOADNAME, TC_LID_LOADNAME]
 
 export interface AdditionalEquipment {
   name: AdditionalEquipmentName
@@ -86,6 +86,10 @@ export const getSlotInformation = (
     modules: deckSetupModules,
     additionalEquipmentOnDeck,
   } = deckSetup
+  const latestDefs = getAllLabwareDefs()
+  const lidLoadNames = Object.values(latestDefs)
+    .filter(def => def.allowedRoles?.includes('lid'))
+    ?.map(def => def.parameters.loadName)
   const offDeckLabware = deckSetupLabware[slot]
   const slotPosition =
     deckDef != null && offDeckLabware == null
@@ -111,26 +115,24 @@ export const getSlotInformation = (
     fullStackFromLabwares?.filter(
       id =>
         deckSetupLabware[id] != null &&
-        deckSetupLabware[id].def.parameters.loadName === TC_LID_LOADNAME
+        lidLoadNames.includes(deckSetupLabware[id].def.parameters.loadName) &&
+        deckSetupLabware[id].def.parameters.loadName !== TIPRACK_LID_LOADNAME
     )?.length ?? 0
-
   const labwareIdsFromFullStack =
     fullStackFromLabwares?.filter(
       id =>
         deckSetupLabware[id] != null &&
         //  remove lid from stack if its a labware + lid
         (numOfTcLidsOnStack === 1 && labwareStackOnSlot.length > 1
-          ? !LID_LOADNAMES.includes(
-              deckSetupLabware[id].def.parameters.loadName
-            )
+          ? !lidLoadNames.includes(deckSetupLabware[id].def.parameters.loadName)
           : //  otherwise, count lid in stack if its a stack of lids
             deckSetupLabware[id].def.parameters.loadName !==
             TIPRACK_LID_LOADNAME)
     ) ?? []
 
   const lidIdFromStack = fullStackFromLabwares?.find(id =>
     numOfTcLidsOnStack === 1
-      ? LID_LOADNAMES.includes(deckSetupLabware[id].def.parameters.loadName)
+      ? lidLoadNames.includes(deckSetupLabware[id].def.parameters.loadName)
       : deckSetupLabware[id]?.def.parameters.loadName === TIPRACK_LID_LOADNAME
   )
 

protocol-designer/src/pages/ProtocolOverview/DeckThumbnailDetails.tsx

@@ -22,7 +22,6 @@ import {
   getTopmostLabwareOnModuleFromStack,
 } from '../../utils'
 import { SlotHover } from './SlotHover'
-import { getShowTCLid } from './utils'
 
 import type { Dispatch, SetStateAction } from 'react'
 import type {
@@ -127,8 +126,7 @@ export const DeckThumbnailDetails = (
       {allLabware.map(labware => {
         if (
           getSlotInLocationStack(labware.stack) === 'offDeck' ||
-          allModules.some(m => labware.stack.includes(m.id)) ||
-          getShowTCLid(labware)
+          allModules.some(m => labware.stack.includes(m.id))
         ) {
           return null
         }

protocol-designer/src/pages/ProtocolOverview/utils.ts

@@ -79,7 +79,6 @@ export const PD_DO_NOT_LIST = [
   'opentrons_tough_1_reservoir_300ml',
   'opentrons_tough_4_reservoir_72ml',
   'opentrons_tough_12_reservoir_22ml',
-  'opentrons_tough_universal_lid',
 ]
 
 export function getIsLabwareV1Tiprack(def: LabwareDefinition1): boolean {