fix(app): disable 'Run a protocol' robot overflow menu item if robot …

…busy Rather than removing the 'Run a protocol' menu item if the robot is busy, here, I render and disable the menu item with a hover tooltip.
Opentrons · Apr 16, 2024 · 96bc4c9 · 96bc4c9
1 parent 829aa79
commit 96bc4c9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 23 deletions.
diff --git a/app/src/organisms/Devices/RobotOverflowMenu.tsx b/app/src/organisms/Devices/RobotOverflowMenu.tsx
@@ -84,25 +84,27 @@ export function RobotOverflowMenu(props: RobotOverflowMenuProps): JSX.Element {
   if (robot.status === CONNECTABLE && runId == null) {
     menuItems = (
       <>
-        {!isRobotBusy ? (
-          <MenuItem
-            {...targetProps}
-            onClick={handleClickRun}
-            disabled={isRobotOnWrongVersionOfSoftware}
-            data-testid={`RobotOverflowMenu_${robot.name}_runProtocol`}
-            css={css`
-              border-radius: ${BORDERS.borderRadius8} ${BORDERS.borderRadius8} 0
-                0;
-            `}
-          >
-            {t('run_a_protocol')}
-          </MenuItem>
-        ) : null}
+        <MenuItem
+          {...targetProps}
+          onClick={handleClickRun}
+          disabled={isRobotOnWrongVersionOfSoftware || isRobotBusy}
+          data-testid={`RobotOverflowMenu_${robot.name}_runProtocol`}
+          css={css`
+            border-radius: ${BORDERS.borderRadius8} ${BORDERS.borderRadius8} 0 0;
+          `}
+        >
+          {t('run_a_protocol')}
+        </MenuItem>
         {isRobotOnWrongVersionOfSoftware && (
           <Tooltip tooltipProps={tooltipProps} whiteSpace="normal">
             {t('shared:a_software_update_is_available')}
           </Tooltip>
         )}
+        {!isRobotOnWrongVersionOfSoftware && isRobotBusy && (
+          <Tooltip tooltipProps={tooltipProps} whiteSpace="normal">
+            {t('shared:robot_is_busy')}
+          </Tooltip>
+        )}
         <Divider marginY="0" />
         <MenuItem
           to={`/devices/${robot.name}/robot-settings`}

diff --git a/app/src/organisms/Devices/__tests__/RobotOverflowMenu.test.tsx b/app/src/organisms/Devices/__tests__/RobotOverflowMenu.test.tsx
@@ -20,6 +20,7 @@ vi.mock('../../../redux/robot-update/selectors')
 vi.mock('../../ProtocolUpload/hooks')
 vi.mock('../../ChooseProtocolSlideout')
 vi.mock('../hooks')
+vi.mock('../../../resources/devices/hooks/useIsEstopNotDisengaged')
 
 const render = (props: React.ComponentProps<typeof RobotOverflowMenu>) => {
   return renderWithProviders(
@@ -85,19 +86,13 @@ describe('RobotOverflowMenu', () => {
     expect(run).toBeDisabled()
   })
 
-  it('should only render robot settings when e-stop is pressed or disconnected', () => {
+  it('disables the run a protocol menu item if robot is busy', () => {
     vi.mocked(useCurrentRunId).mockReturnValue(null)
-    vi.mocked(getRobotUpdateDisplayInfo).mockReturnValue({
-      autoUpdateAction: 'upgrade',
-      autoUpdateDisabledReason: null,
-      updateFromFileDisabledReason: null,
-    })
-
     vi.mocked(useIsRobotBusy).mockReturnValue(true)
     render(props)
     const btn = screen.getByLabelText('RobotOverflowMenu_button')
     fireEvent.click(btn)
-    expect(screen.queryByText('Run a protocol')).not.toBeInTheDocument()
-    screen.getByText('Robot settings')
+    const run = screen.getByText('Run a protocol')
+    expect(run).toBeDisabled()
   })
 })