fix(app): filter for duplicate defUri after filtering for tipracks us…

…ed (#13182) Fix RQA-1110
Opentrons · Jul 27, 2023 · b0f5fa6 · b0f5fa6
1 parent 74448b1
commit b0f5fa6
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 5 deletions.
diff --git a/app/src/organisms/ApplyHistoricOffsets/hooks/__tests__/getLabwareLocationCombos.test.ts b/app/src/organisms/ApplyHistoricOffsets/hooks/__tests__/getLabwareLocationCombos.test.ts
@@ -119,6 +119,13 @@ const mockLabwareEntities: ProtocolAnalysisOutput['labware'] = [
     location: { slotName: '2' },
     displayName: 'second labware nickname',
   },
+  {
+    id: 'secondLabwareId',
+    loadName: mockLabwareDef.parameters.loadName,
+    definitionUri: getLabwareDefURI(mockLabwareDef),
+    location: { slotName: '2' },
+    displayName: 'second labware nickname',
+  },
   {
     id: 'duplicateLabwareId',
     loadName: mockLabwareDef.parameters.loadName,
@@ -159,6 +166,11 @@ describe('getLabwareLocationCombos', () => {
         labwareId: 'secondLabwareId',
         definitionUri: getLabwareDefURI(mockLabwareDef),
       },
+      {
+        location: { slotName: '2' },
+        labwareId: 'duplicateLabwareId',
+        definitionUri: getLabwareDefURI(mockLabwareDef),
+      },
       {
         location: { slotName: '3', moduleModel: 'heaterShakerModuleV1' },
         labwareId: 'onModuleLabwareId',
@@ -263,6 +275,11 @@ describe('getLabwareLocationCombos', () => {
         labwareId: 'secondLabwareId',
         definitionUri: getLabwareDefURI(mockLabwareDef),
       },
+      {
+        location: { slotName: '2' },
+        labwareId: 'duplicateLabwareId',
+        definitionUri: getLabwareDefURI(mockLabwareDef),
+      },
       {
         location: { slotName: '3', moduleModel: 'heaterShakerModuleV1' },
         labwareId: 'onModuleLabwareId',
@@ -279,6 +296,11 @@ describe('getLabwareLocationCombos', () => {
         labwareId: 'secondLabwareId',
         definitionUri: getLabwareDefURI(mockLabwareDef),
       },
+      {
+        location: { slotName: '5' },
+        labwareId: 'duplicateLabwareId',
+        definitionUri: getLabwareDefURI(mockLabwareDef),
+      },
     ])
   })
 })
diff --git a/app/src/organisms/ApplyHistoricOffsets/hooks/getLabwareLocationCombos.ts b/app/src/organisms/ApplyHistoricOffsets/hooks/getLabwareLocationCombos.ts
@@ -6,7 +6,7 @@ import type {
 } from '@opentrons/shared-data'
 import { LabwareOffsetLocation } from '@opentrons/api-client'
 
-interface LabwareLocationCombo {
+export interface LabwareLocationCombo {
   location: LabwareOffsetLocation
   definitionUri: string
   labwareId: string
@@ -84,6 +84,7 @@ function appendLocationComboIfUniq(
 ): LabwareLocationCombo[] {
   const locationComboAlreadyExists = acc.some(
     combo =>
+      combo.labwareId === locationCombo.labwareId &&
       isEqual(combo.location, locationCombo.location) &&
       combo.definitionUri === locationCombo.definitionUri
   )

diff --git a/app/src/organisms/LabwarePositionCheck/utils/getCheckSteps.ts b/app/src/organisms/LabwarePositionCheck/utils/getCheckSteps.ts
@@ -1,3 +1,4 @@
+import { isEqual } from 'lodash'
 import { SECTIONS } from '../constants'
 import { getLabwareDefinitionsFromCommands } from './labware'
 import {
@@ -18,7 +19,8 @@ import type {
   RunTimeCommand,
   ProtocolAnalysisOutput,
 } from '@opentrons/shared-data'
-import type { PickUpTipRunTimeCommand } from '@opentrons/shared-data/protocol/types/schemaV7/command/pipetting'
+import type { PickUpTipRunTimeCommand } from '@opentrons/shared-data/protocol/types/schemaV6/command/pipetting'
+import type { LabwareLocationCombo } from '../../ApplyHistoricOffsets/hooks/getLabwareLocationCombos'
 
 interface LPCArgs {
   primaryPipetteId: string
@@ -109,9 +111,23 @@ function getCheckTipRackSectionSteps(args: LPCArgs): CheckTipRacksStep[] {
     ...onlySecondaryPipettePickUpTipCommands,
     ...uniqPrimaryPipettePickUpTipCommands,
   ].reduce<CheckTipRacksStep[]>((acc, { params }) => {
-    const labwareLocations = labwareLocationCombos.filter(
-      combo => combo.labwareId === params.labwareId
-    )
+    const labwareLocations = labwareLocationCombos.reduce<
+      LabwareLocationCombo[]
+    >((acc, labwareLocationCombo) => {
+      // remove labware that isn't accessed by a pickup tip command
+      if (labwareLocationCombo.labwareId !== params.labwareId) {
+        return acc
+      }
+      // remove duplicate definitionUri in same location
+      const comboAlreadyExists = acc.some(
+        accLocationCombo =>
+          labwareLocationCombo.definitionUri ===
+            accLocationCombo.definitionUri &&
+          isEqual(labwareLocationCombo.location, accLocationCombo.location)
+      )
+      return comboAlreadyExists ? acc : [...acc, labwareLocationCombo]
+    }, [])
+
     return [
       ...acc,
       ...labwareLocations.map(({ location }) => ({