refactor SetupLabwareMap and getLocationInfoNames util to check addre…

…ssable areas
Opentrons · Aug 9, 2024 · 67b14aa · 67b14aa
1 parent 1382fcc
commit 67b14aa
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 11 deletions.
diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareMap.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabware/SetupLabwareMap.tsx
@@ -25,7 +25,6 @@ import { OffDeckLabwareList } from './OffDeckLabwareList'
 
 import type {
   CompletedProtocolAnalysis,
-  LoadLabwareRunTimeCommand,
   ProtocolAnalysisOutput,
 } from '@opentrons/shared-data'
 import { LabwareStackModal } from './LabwareStackModal'
@@ -143,23 +142,15 @@ export function SetupLabwareMap({
         topLabwareId != null &&
         labwareInAdapter != null
 
-      const loadLabwareCommand = commands.find(
-        command =>
-          command.commandType === 'loadLabware' &&
-          command.result?.labwareId === labwareId
-      ) as LoadLabwareRunTimeCommand
-      const labwareLocation = loadLabwareCommand?.params.location
       return {
-        labwareLocation,
+        labwareLocation: { slotName },
         definition: topLabwareDefinition,
         topLabwareId,
         topLabwareDisplayName,
-        // TODO (nd: 08/08/2024) fix passing of onLabwareClick to actually perform click handling.
-        // Here, I set to an empty function to produce pointer cursor style.
-        onLabwareClick: isLabwareInStack ? () => {} : undefined,
         highlight: isLabwareInStack && hoverLabwareId === topLabwareId,
         labwareChildren: (
           <g
+            cursor={isLabwareInStack ? 'pointer' : ''}
             onClick={() => {
               if (isLabwareInStack) {
                 setLabwareStackDetailsLabwareId(topLabwareId)

diff --git a/app/src/organisms/Devices/ProtocolRun/utils/__tests__/getLocationInfoNames.test.ts b/app/src/organisms/Devices/ProtocolRun/utils/__tests__/getLocationInfoNames.test.ts
@@ -6,6 +6,7 @@ import type { ModuleModel } from '@opentrons/shared-data'
 const ADAPTER_DISPLAY_NAME = 'Opentrons 96 Flat Bottom Adapter'
 const LABWARE_DISPLAY_NAME = 'Corning 24 Well Plate 3.4 mL Flat'
 const SLOT = '5'
+const SLOT_EXTENSION = 'C4'
 const MOCK_MODEL = 'heaterShakerModuleV1' as ModuleModel
 const ADAPTER_ID =
   'd9a85adf-d272-4edd-9aae-426ef5756fef:opentrons/opentrons_96_flat_bottom_adapter/1'
@@ -119,6 +120,34 @@ const MOCK_ADAPTER_COMMANDS = [
     },
   },
 ]
+const MOCK_ADAPTER_EXTENSION_COMMANDS = [
+  {
+    commandType: 'loadLabware',
+    params: {
+      location: {
+        addressableAreaName: SLOT_EXTENSION,
+      },
+    },
+    result: {
+      labwareId: ADAPTER_ID,
+      definition: {
+        metadata: { displayName: ADAPTER_DISPLAY_NAME },
+      },
+    },
+  },
+  {
+    commandType: 'loadLabware',
+    params: {
+      location: {
+        labwareId: ADAPTER_ID,
+      },
+    },
+    result: {
+      labwareId: LABWARE_ID,
+      definition: {},
+    },
+  },
+]
 
 vi.mock('@opentrons/shared-data')
 
@@ -168,4 +197,15 @@ describe('getLocationInfoNames', () => {
       getLocationInfoNames(LABWARE_ID, MOCK_ADAPTER_COMMANDS as any)
     ).toEqual(expected)
   })
+  it('returns the adapter, slot number if the labware is on an adapter on the deck extension slot', () => {
+    const expected = {
+      slotName: SLOT_EXTENSION,
+      labwareName: LABWARE_DISPLAY_NAME,
+      adapterName: ADAPTER_DISPLAY_NAME,
+      adapterId: ADAPTER_ID,
+    }
+    expect(
+      getLocationInfoNames(LABWARE_ID, MOCK_ADAPTER_EXTENSION_COMMANDS as any)
+    ).toEqual(expected)
+  })
 })
diff --git a/app/src/organisms/Devices/ProtocolRun/utils/getLocationInfoNames.ts b/app/src/organisms/Devices/ProtocolRun/utils/getLocationInfoNames.ts
@@ -87,6 +87,18 @@ export function getLocationInfoNames(
           loadedAdapterCommand?.result?.definition.metadata.displayName,
         adapterId: loadedAdapterCommand?.result?.labwareId,
       }
+    } else if (
+      loadedAdapterCommand?.params.location !== 'offDeck' &&
+      'addressableAreaName' in loadedAdapterCommand?.params.location
+    ) {
+      return {
+        slotName: loadedAdapterCommand?.params.location.addressableAreaName,
+        labwareName,
+        labwareNickname,
+        adapterName:
+          loadedAdapterCommand?.result?.definition.metadata.displayName,
+        adapterId: loadedAdapterCommand?.result?.labwareId,
+      }
     } else if (
       loadedAdapterCommand?.params.location !== 'offDeck' &&
       'moduleId' in loadedAdapterCommand?.params.location