fix(app): ensure ApplyHistoricOffsets renders on non-RTP protocols (#…

…14948) closes RQA-2606
Opentrons · May 20, 2024 · e180631 · e180631
1 parent 41ea773
commit e180631
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/...isms/ChooseRobotToRunProtocolSlideout/__tests__/ChooseRobotToRunProtocolSlideout.test.tsx b/...isms/ChooseRobotToRunProtocolSlideout/__tests__/ChooseRobotToRunProtocolSlideout.test.tsx
@@ -403,4 +403,18 @@ describe('ChooseRobotToRunProtocolSlideout', () => {
     })
     expect(proceedButton).toBeDisabled()
   })
+
+  it('renders labware offset data selection and learn more button launches help modal', () => {
+    render({
+      storedProtocolData: storedProtocolDataFixture,
+      onCloseClick: vi.fn(),
+      showSlideout: true,
+    })
+    screen.getByText('No offset data available')
+    const learnMoreLink = screen.getByText('Learn more')
+    fireEvent.click(learnMoreLink)
+    screen.getByText(
+      'Labware offset data references previous protocol run labware locations to save you time. If all the labware in this protocol have been checked in previous runs, that data will be applied to this run.'
+    )
+  })
 })
diff --git a/app/src/organisms/ChooseRobotToRunProtocolSlideout/index.tsx b/app/src/organisms/ChooseRobotToRunProtocolSlideout/index.tsx
@@ -158,7 +158,7 @@ export function ChooseRobotToRunProtocolSlideoutComponent(
       ? mostRecentAnalysis?.robotType ?? null
       : null
 
-  const SinglePageButtonWithoutFF = (
+  const singlePageButton = (
     <PrimaryButton
       disabled={
         isCreatingRun ||
@@ -176,6 +176,17 @@ export function ChooseRobotToRunProtocolSlideoutComponent(
     </PrimaryButton>
   )
 
+  const offsetsComponent = (
+    <ApplyHistoricOffsets
+      offsetCandidates={offsetCandidates}
+      shouldApplyOffsets={shouldApplyOffsets}
+      setShouldApplyOffsets={setShouldApplyOffsets}
+      commands={mostRecentAnalysis?.commands ?? []}
+      labware={mostRecentAnalysis?.labware ?? []}
+      modules={mostRecentAnalysis?.modules ?? []}
+    />
+  )
+
   const resetRunTimeParameters = (): void => {
     setRunTimeParametersOverrides(
       runTimeParametersOverrides?.map(parameter => ({
@@ -214,14 +225,7 @@ export function ChooseRobotToRunProtocolSlideoutComponent(
           {hasRunTimeParameters ? (
             currentPage === 1 ? (
               <>
-                <ApplyHistoricOffsets
-                  offsetCandidates={offsetCandidates}
-                  shouldApplyOffsets={shouldApplyOffsets}
-                  setShouldApplyOffsets={setShouldApplyOffsets}
-                  commands={mostRecentAnalysis?.commands ?? []}
-                  labware={mostRecentAnalysis?.labware ?? []}
-                  modules={mostRecentAnalysis?.modules ?? []}
-                />
+                {offsetsComponent}
                 <PrimaryButton
                   onClick={() => setCurrentPage(2)}
                   width="100%"
@@ -253,7 +257,10 @@ export function ChooseRobotToRunProtocolSlideoutComponent(
               </Flex>
             )
           ) : (
-            SinglePageButtonWithoutFF
+            <>
+              {offsetsComponent}
+              {singlePageButton}
+            </>
           )}
         </Flex>
       }