From a4fbd23f22c0e4d2d34e0de2522ba9a274f5a784 Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Tue, 23 Jun 2020 16:31:50 -0400 Subject: [PATCH 1/3] fix(app): calcheck: content fixups - Correctly describe the calibration check feature on the robot controls page - Correctly recommend deck calibration if tip pickup is incorrect --- app/src/components/CheckCalibration/BadCalibration.js | 2 +- app/src/components/RobotSettings/CheckCalibrationControl.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/components/CheckCalibration/BadCalibration.js b/app/src/components/CheckCalibration/BadCalibration.js index 541fb7df47a..1327b423c75 100644 --- a/app/src/components/CheckCalibration/BadCalibration.js +++ b/app/src/components/CheckCalibration/BadCalibration.js @@ -9,7 +9,7 @@ const SUMMARY = const TO_TROUBLESHOOT = 'To troubleshoot this issue:' const TIP_RACK_CENTERED = 'Confirm your tip rack is centered in its slot' const USE_OPENTRONS_TIPS = 'Confirm you are using Opentrons brand tips' -const PERFORM_CALIBRATION = 'If you continue to see this error, view' +const PERFORM_CALIBRATION = 'If you continue to see this error, please perform a deck calibration and then try again. View' const THIS_ARTICLE = 'this article' const LEARN_MORE = 'to troubleshoot' const BAD_ROBOT_CALIBRATION_CHECK_BUTTON_TEXT = 'Drop tip in trash and exit' diff --git a/app/src/components/RobotSettings/CheckCalibrationControl.js b/app/src/components/RobotSettings/CheckCalibrationControl.js index 40f8e7f6e48..4a62bcfbbb7 100644 --- a/app/src/components/RobotSettings/CheckCalibrationControl.js +++ b/app/src/components/RobotSettings/CheckCalibrationControl.js @@ -36,7 +36,8 @@ export type CheckCalibrationControlProps = {| const CHECK = 'Check' const CHECK_ROBOT_CAL = 'Check robot calibration' -const CHECK_ROBOT_CAL_DESCRIPTION = "Check the robot's calibration state" +const CHECK_ROBOT_CAL_DESCRIPTION = + "Check the robot's calibration status and diagnose common pipette positioning problems." const COULD_NOT_START = 'Could not start Robot Calibration Check' const PLEASE_TRY_AGAIN = 'Please try again or contact support if you continue to experience issues' From 64b46e47eca65bf22c9cc631467841b8ca2f6d6a Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Tue, 23 Jun 2020 16:35:33 -0400 Subject: [PATCH 2/3] make format --- app/src/components/CheckCalibration/BadCalibration.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/components/CheckCalibration/BadCalibration.js b/app/src/components/CheckCalibration/BadCalibration.js index 1327b423c75..a30b1c300c8 100644 --- a/app/src/components/CheckCalibration/BadCalibration.js +++ b/app/src/components/CheckCalibration/BadCalibration.js @@ -9,7 +9,8 @@ const SUMMARY = const TO_TROUBLESHOOT = 'To troubleshoot this issue:' const TIP_RACK_CENTERED = 'Confirm your tip rack is centered in its slot' const USE_OPENTRONS_TIPS = 'Confirm you are using Opentrons brand tips' -const PERFORM_CALIBRATION = 'If you continue to see this error, please perform a deck calibration and then try again. View' +const PERFORM_CALIBRATION = + 'If you continue to see this error, please perform a deck calibration and then try again. View' const THIS_ARTICLE = 'this article' const LEARN_MORE = 'to troubleshoot' const BAD_ROBOT_CALIBRATION_CHECK_BUTTON_TEXT = 'Drop tip in trash and exit' From 71a532725dc53f00473528940f7b532f3b30ad5f Mon Sep 17 00:00:00 2001 From: Seth Foster Date: Tue, 23 Jun 2020 17:07:57 -0400 Subject: [PATCH 3/3] fixup: test regex update --- .../RobotSettings/__tests__/CheckCalibrationControl.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/components/RobotSettings/__tests__/CheckCalibrationControl.test.js b/app/src/components/RobotSettings/__tests__/CheckCalibrationControl.test.js index 3d78369e393..32a13224d1e 100644 --- a/app/src/components/RobotSettings/__tests__/CheckCalibrationControl.test.js +++ b/app/src/components/RobotSettings/__tests__/CheckCalibrationControl.test.js @@ -51,7 +51,7 @@ describe('CheckCalibrationControl', () => { const titledButton = wrapper.find(TitledButton) expect(titledButton.prop('title')).toBe('Check robot calibration') - expect(titledButton.html()).toMatch(/check the robot's calibration state/i) + expect(titledButton.html()).toMatch(/check the robot's calibration status/i) expect(titledButton.prop('buttonProps')).toMatchObject({ children: 'Check', disabled: false,