filter out nonzero offsets and pass as prop to currentoffsetstable

Opentrons · Oct 2, 2023 · 2907539 · 2907539
1 parent fed11a1
commit 2907539
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/CurrentOffsetsTable.tsx
@@ -22,7 +22,6 @@ import { StyledText } from '../../../../atoms/text'
 import { LabwareOffsetTabs } from '../../../LabwareOffsetTabs'
 import { OffsetVector } from '../../../../molecules/OffsetVector'
 import { PythonLabwareOffsetSnippet } from '../../../../molecules/PythonLabwareOffsetSnippet'
-import { getLatestCurrentOffsets } from './utils'
 import type { LabwareOffset } from '@opentrons/api-client'
 import type {
   RunTimeCommand,
@@ -71,7 +70,6 @@ export function CurrentOffsetsTable(
   const isLabwareOffsetCodeSnippetsOn = useSelector(
     getIsLabwareOffsetCodeSnippetsOn
   )
-  const latestCurrentOffsets = getLatestCurrentOffsets(currentOffsets)
 
   const TableComponent = (
     <OffsetTable>
@@ -83,7 +81,7 @@ export function CurrentOffsetsTable(
         </tr>
       </thead>
       <tbody>
-        {latestCurrentOffsets.map(offset => {
+        {currentOffsets.map(offset => {
           const labwareDisplayName =
             offset.definitionUri in defsByURI
               ? getLabwareDisplayName(defsByURI[offset.definitionUri])
@@ -112,7 +110,7 @@ export function CurrentOffsetsTable(
   const JupyterSnippet = (
     <PythonLabwareOffsetSnippet
       mode="jupyter"
-      labwareOffsets={latestCurrentOffsets.map(o =>
+      labwareOffsets={currentOffsets.map(o =>
         pick(o, ['definitionUri', 'location', 'vector'])
       )}
       commands={commands ?? []}
@@ -123,7 +121,7 @@ export function CurrentOffsetsTable(
   const CommandLineSnippet = (
     <PythonLabwareOffsetSnippet
       mode="cli"
-      labwareOffsets={latestCurrentOffsets.map(o =>
+      labwareOffsets={currentOffsets.map(o =>
         pick(o, ['definitionUri', 'location', 'vector'])
       )}
       commands={commands ?? []}

diff --git a/...isms/Devices/ProtocolRun/SetupLabwarePositionCheck/__tests__/CurrentOffsetsTable.test.tsx b/...isms/Devices/ProtocolRun/SetupLabwarePositionCheck/__tests__/CurrentOffsetsTable.test.tsx
@@ -60,13 +60,6 @@ const mockCurrentOffsets: LabwareOffset[] = [
     location: { slotName: '1', moduleModel: 'heaterShakerModuleV1' },
     vector: { x: 0, y: 0, z: 0 },
   },
-  {
-    createdAt: '2022-12-20T14:09:08.688756+00:00',
-    definitionUri: 'opentrons/opentrons_96_tiprack_10ul/1',
-    id: '494ec3d1-224f-4f9a-a83b-3dd3060ea332',
-    location: { slotName: '2' },
-    vector: { x: 0, y: -0.09999999999999432, z: -0.09999999999999432 },
-  },
   {
     createdAt: '2022-12-20T14:09:08.689813+00:00',
     definitionUri:

diff --git a/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx b/app/src/organisms/Devices/ProtocolRun/SetupLabwarePositionCheck/index.tsx
@@ -22,6 +22,7 @@ import { CurrentOffsetsTable } from './CurrentOffsetsTable'
 import { useLaunchLPC } from '../../../LabwarePositionCheck/useLaunchLPC'
 import { StyledText } from '../../../../atoms/text'
 import type { LabwareOffset } from '@opentrons/api-client'
+import { getLatestCurrentOffsets } from './utils'
 
 interface SetupLabwarePositionCheckProps {
   expandLabwareStep: () => void
@@ -64,15 +65,17 @@ export function SetupLabwarePositionCheck(
 
   const { launchLPC, LPCWizard } = useLaunchLPC(runId)
 
+  const nonIdentityOffsets = getLatestCurrentOffsets(sortedOffsets)
+
   return (
     <Flex
       flexDirection={DIRECTION_COLUMN}
       marginTop={SPACING.spacing16}
       gridGap={SPACING.spacing16}
     >
-      {sortedOffsets.length > 0 ? (
+      {nonIdentityOffsets.length > 0 ? (
         <CurrentOffsetsTable
-          currentOffsets={sortedOffsets}
+          currentOffsets={nonIdentityOffsets}
           commands={protocolData?.commands ?? []}
           labware={protocolData?.labware ?? []}
           modules={protocolData?.modules ?? []}