Skip to content

Commit 42db140

Browse files
authored
refactor(app): remove top-level calibration warning (#7036)
This removes the warning in the calibration card about robot calibration being bad, since that confused people into thinking it meant only deck calibration. It keeps the same logic about not displaying health check.
1 parent 92f1cbf commit 42db140

File tree

3 files changed

+18
-82
lines changed

3 files changed

+18
-82
lines changed

app/src/components/RobotSettings/CalibrationCard.js

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import {
4545
} from './constants'
4646
import { DeckCalibrationControl } from './DeckCalibrationControl'
4747
import { CheckCalibrationControl } from './CheckCalibrationControl'
48-
import { CalibrationCardWarning } from './CalibrationCardWarning'
4948
import { PipetteOffsets } from './PipetteOffsets'
5049

5150
type Props = {|
@@ -152,12 +151,14 @@ export function CalibrationCard(props: Props): React.Node {
152151
)
153152
}
154153

155-
const warningInsteadOfCalcheck =
156-
[
154+
const displayCalCheck =
155+
![
157156
Calibration.DECK_CAL_STATUS_SINGULARITY,
158157
Calibration.DECK_CAL_STATUS_BAD_CALIBRATION,
159158
Calibration.DECK_CAL_STATUS_IDENTITY,
160-
].includes(deckCalStatus) || !pipetteCalPresent
159+
].includes(deckCalStatus) &&
160+
pipetteCalPresent &&
161+
pipettePresent
161162

162163
const pipOffsetDataPresent = pipetteOffsetCalibrations
163164
? pipetteOffsetCalibrations.length > 0
@@ -177,20 +178,17 @@ export function CalibrationCard(props: Props): React.Node {
177178
>
178179
{TITLE}
179180
</Text>
180-
{!warningInsteadOfCalcheck ? (
181-
<Link
182-
href="#"
183-
color={C_BLUE}
184-
paddingTop={SPACING_3}
185-
paddingX={SPACING_3}
186-
fontSize={FONT_SIZE_BODY_1}
187-
onClick={onClickSaveAs}
188-
>
189-
{DOWNLOAD_CALIBRATION}
190-
</Link>
191-
) : null}
181+
<Link
182+
href="#"
183+
color={C_BLUE}
184+
paddingTop={SPACING_3}
185+
paddingX={SPACING_3}
186+
fontSize={FONT_SIZE_BODY_1}
187+
onClick={onClickSaveAs}
188+
>
189+
{DOWNLOAD_CALIBRATION}
190+
</Link>
192191
</Flex>
193-
{warningInsteadOfCalcheck ? <CalibrationCardWarning /> : null}
194192
<DeckCalibrationControl
195193
robotName={robotName}
196194
disabledReason={buttonDisabledReason}
@@ -199,7 +197,7 @@ export function CalibrationCard(props: Props): React.Node {
199197
pipOffsetDataPresent={pipOffsetDataPresent}
200198
/>
201199
<PipetteOffsets pipettesPageUrl={pipettesPageUrl} robot={robot} />
202-
{!warningInsteadOfCalcheck && pipettePresent ? (
200+
{displayCalCheck ? (
203201
<CheckCalibrationControl
204202
robotName={robotName}
205203
disabledReason={buttonDisabledReason}

app/src/components/RobotSettings/CalibrationCardWarning.js

Lines changed: 0 additions & 59 deletions
This file was deleted.

app/src/components/RobotSettings/__tests__/CalibrationCard.test.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import * as RobotSelectors from '../../../robot/selectors'
1313

1414
import { CalibrationCard } from '../CalibrationCard'
1515
import { CheckCalibrationControl } from '../CheckCalibrationControl'
16-
import { CalibrationCardWarning } from '../CalibrationCardWarning'
1716
import { PipetteOffsets } from '../PipetteOffsets'
1817
import { mockAttachedPipette } from '../../../pipettes/__fixtures__'
1918
import { mockPipetteOffsetCalibration1 } from '../../../calibration/pipette-offset/__fixtures__'
@@ -257,27 +256,25 @@ describe('CalibrationCard', () => {
257256
Calibration.DECK_CAL_STATUS_BAD_CALIBRATION,
258257
]
259258
cals.forEach(status => {
260-
it(`CalibrationCardWarning component renders instead of check calibration if deck calibration is ${status}`, () => {
259+
it(`check calibration does not render if deck calibration is ${status}`, () => {
261260
getDeckCalibrationStatus.mockImplementation((state, rName) => {
262261
expect(state).toEqual(MOCK_STATE)
263262
expect(rName).toEqual(mockRobot.name)
264263
return status
265264
})
266265
const { wrapper } = render()
267266

268-
expect(wrapper.exists(CalibrationCardWarning)).toBe(true)
269267
expect(wrapper.exists(CheckCalibrationControl)).toBe(false)
270268
})
271269
})
272270

273-
it('CalibrationCardWarning component renders instead of check calibration if pipette calibration is missing', () => {
271+
it('check calibration does not render if pipette calibration is missing', () => {
274272
getAttachedPipetteCalibrations.mockReturnValue({
275273
left: { offset: null, tipLength: null },
276274
right: { offset: null, tipLength: null },
277275
})
278276
const { wrapper } = render()
279277

280-
expect(wrapper.exists(CalibrationCardWarning)).toBe(true)
281278
expect(wrapper.exists(CheckCalibrationControl)).toBe(false)
282279
})
283280

0 commit comments

Comments
 (0)