refactor(app): display alert-circle in robot tab if any calibration i…

…s marked bad (#6948) * refactor(app): display alert-circle in robot tab if calibration is marked bad closes #6604 * check attached pip offset & tip length as well * fix lint error * make requested changes
Opentrons · Nov 9, 2020 · 4075aa5 · 4075aa5
1 parent 157c8f5
commit 4075aa5
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 4 deletions.
diff --git a/app/src/components/Navbar/NavbarLink.js b/app/src/components/Navbar/NavbarLink.js
@@ -58,15 +58,18 @@ export function NavbarLink(props: NavbarLinkProps): React.Node {
     iconName,
     disabledReason,
     notificationReason,
+    warningReason,
     ...styleProps
   } = props
 
   const [targetProps, tooltipProps] = useHoverTooltip({
     placement: TOOLTIP_RIGHT,
   })
-  const tooltipContents = disabledReason ?? notificationReason ?? null
+  const tooltipContents =
+    disabledReason ?? notificationReason ?? warningReason ?? null
   const hasNotification = Boolean(notificationReason)
   const isDisabled = Boolean(disabledReason)
+  const hasWarning = Boolean(warningReason)
 
   const LinkComponent = isDisabled ? 'div' : NavLink
   const linkProps = isDisabled ? styleProps : { to: path, ...styleProps }
@@ -84,7 +87,9 @@ export function NavbarLink(props: NavbarLinkProps): React.Node {
       >
         <NotificationIcon
           name={iconName}
-          childName={hasNotification ? 'circle' : null}
+          childName={
+            hasWarning ? 'alert-circle' : hasNotification ? 'circle' : null
+          }
           width="100%"
           paddingX={SPACING_2}
         />

diff --git a/app/src/components/Navbar/__tests__/NavbarLink.test.js b/app/src/components/Navbar/__tests__/NavbarLink.test.js
@@ -108,6 +108,35 @@ describe('NavbarLink component', () => {
     expect(icon.prop('childName')).toBe('circle')
   })
 
+  it('should render a warning if there is a reason to', () => {
+    const wrapper = render({
+      id: 'foo',
+      path: '/foo',
+      title: 'Foo',
+      iconName: 'alert',
+      warningReason: 'hello',
+    })
+    const icon = wrapper.find(NotificationIcon)
+
+    expect(icon.prop('name')).toBe('alert')
+    expect(icon.prop('childName')).toBe('alert-circle')
+  })
+
+  it('should render a warning icon if both notification and warning reasons exist', () => {
+    const wrapper = render({
+      id: 'foo',
+      path: '/foo',
+      title: 'Foo',
+      iconName: 'alert',
+      notificationReason: 'hi',
+      warningReason: 'hello',
+    })
+    const icon = wrapper.find(NotificationIcon)
+
+    expect(icon.prop('name')).toBe('alert')
+    expect(icon.prop('childName')).toBe('alert-circle')
+  })
+
   it('should render the link title', () => {
     const wrapper = render({
       id: 'foo',

diff --git a/app/src/nav/__tests__/selectors.test.js b/app/src/nav/__tests__/selectors.test.js
@@ -97,6 +97,7 @@ const EXPECTED_ROBOTS = {
   title: 'Robot',
   iconName: 'ot-connect',
   notificationReason: null,
+  warningReason: null,
 }
 
 const EXPECTED_UPLOAD = {
@@ -295,7 +296,10 @@ describe('nav selectors', () => {
         mockGetDeckCalibrationStatus.mockReturnValue(DECK_CAL_STATUS_IDENTITY)
       },
       expected: [
-        EXPECTED_ROBOTS,
+        {
+          ...EXPECTED_ROBOTS,
+          warningReason: expect.stringMatching(/Robot calibration recommended/),
+        },
         {
           ...EXPECTED_UPLOAD,
           disabledReason: expect.stringMatching(/calibrate your deck/i),

diff --git a/app/src/nav/selectors.js b/app/src/nav/selectors.js
@@ -5,6 +5,8 @@ import { getConnectedRobot } from '../discovery'
 import {
   getProtocolPipettesMatching,
   getProtocolPipettesCalibrated,
+  getAttachedPipetteCalibrations,
+  PIPETTE_MOUNTS,
 } from '../pipettes'
 import { selectors as RobotSelectors } from '../robot'
 import { UPGRADE, getBuildrootUpdateAvailable } from '../buildroot'
@@ -41,6 +43,7 @@ const CALIBRATE_DECK_TO_PROCEED = 'Calibrate your deck to proceed'
 const APP_UPDATE_AVAILABLE = 'An app update is available'
 const DRIVER_UPDATE_AVAILABLE = 'A driver update is available'
 const ROBOT_UPDATE_AVAILABLE = 'A robot software update is available'
+const ROBOT_CALIBRATION_RECOMMENDED = 'Robot calibration recommended'
 
 const getConnectedRobotPipettesMatch = (state: State): boolean => {
   const connectedRobot = getConnectedRobot(state)
@@ -75,6 +78,25 @@ const getDeckCalibrationOk = (state: State): boolean => {
   return deckCalStatus === DECK_CAL_STATUS_OK
 }
 
+const getRobotCalibrationOk = (state: State): boolean => {
+  const connectedRobot = getConnectedRobot(state)
+  if (!connectedRobot) return false
+
+  const deckCalOk = getDeckCalibrationOk(state)
+  const pipCal = getAttachedPipetteCalibrations(state, connectedRobot.name)
+  for (const m of PIPETTE_MOUNTS) {
+    if (pipCal) {
+      if (
+        pipCal[m]?.offset?.status?.markedBad ||
+        pipCal[m]?.tipLength?.status?.markedBad
+      ) {
+        return false
+      }
+    }
+  }
+  return deckCalOk
+}
+
 const getRunDisabledReason: State => string | null = createSelector(
   getConnectedRobot,
   RobotSelectors.getSessionIsLoaded,
@@ -94,13 +116,16 @@ const getRunDisabledReason: State => string | null = createSelector(
 )
 
 export const getRobotsLocation: State => NavLocation = createSelector(
+  getConnectedRobot,
   getConnectedRobotUpdateAvailable,
-  update => ({
+  getRobotCalibrationOk,
+  (robot, update, robotCalOk) => ({
     id: 'robots',
     path: '/robots',
     title: ROBOT,
     iconName: 'ot-connect',
     notificationReason: update ? ROBOT_UPDATE_AVAILABLE : null,
+    warningReason: robot && !robotCalOk ? ROBOT_CALIBRATION_RECOMMENDED : null,
   })
 )
 

diff --git a/app/src/nav/types.js b/app/src/nav/types.js
@@ -9,6 +9,7 @@ export type NavLocation = {|
   iconName: IconName,
   disabledReason?: string | null,
   notificationReason?: string | null,
+  warningReason?: string | null,
 |}
 
 export type SubnavLocation = {|