Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(odd): single mount and 96-channel pipette flows (attach, detach, cal) #12210

Merged
merged 28 commits into from
Mar 17, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
dc73196
feat(odd): single mount pipette attach and calibrate flows
jerader Feb 28, 2023
b10b4e5
pointer: coarse
jerader Feb 28, 2023
4d39211
ui for detach flow
jerader Mar 1, 2023
cc2bf4d
modify wizard header text to match designs
jerader Mar 1, 2023
87ee772
fix tests
jerader Mar 2, 2023
5210165
add different text in attachProbe for 8 channel
jerader Mar 2, 2023
ee4936a
add odd support to 96-channel flows
jerader Mar 3, 2023
32dd0eb
modify exit modal to match designs
jerader Mar 3, 2023
f4f684d
fix detachPipette test
jerader Mar 6, 2023
2c596a9
edit small button, delete alertSmallButton
jerader Mar 6, 2023
345cee6
fix tests around SmallButton
jerader Mar 7, 2023
b11c2eb
fix small button blended colors
jerader Mar 7, 2023
1c11e3f
fix last test
jerader Mar 7, 2023
de81b9e
fix smallbutton test
jerader Mar 8, 2023
a4f6568
fix rebasing issues
jerader Mar 9, 2023
33445ef
address comments, refactor SmallButton styles
jerader Mar 10, 2023
83eb941
fix wizardHeader exit bug and clean up isFetching boolean
jerader Mar 10, 2023
a590dfa
fix active css state colors for SmallButton
jerader Mar 10, 2023
20bda57
fix generic wizard tile test
jerader Mar 11, 2023
23c2ecb
update color names to include opacity;
jerader Mar 13, 2023
34a371d
cleanup small button imports, clean up MediumButtonRounded storybook …
jerader Mar 14, 2023
5ff020b
remove added color constants and replace with hex codes for now
jerader Mar 14, 2023
a02026b
address feedback - use correct constants
jerader Mar 14, 2023
301f3e1
fix link
jerader Mar 14, 2023
b260ee9
use newer constants, rename folder to OnDeviceDisplay
jerader Mar 15, 2023
f4ea81e
add temp odd button to get back to main menu from attachInstrumentsDa…
jerader Mar 15, 2023
7d76618
fix rebase error
jerader Mar 16, 2023
fcf77f6
fix onClick in Carriage
jerader Mar 17, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix tests
  • Loading branch information
jerader committed Mar 16, 2023
commit 87ee772792bfec47ccb8f1994853718c43035aeb
Original file line number Diff line number Diff line change
Expand Up @@ -44,28 +44,26 @@ describe('ExitConfirmation', () => {
})

it('renders correct text for attach flow', () => {
const { getByRole, getByText } = render({
const { getByText } = render({
flowType: GRIPPER_FLOW_TYPES.ATTACH,
})[0]
getByRole('heading', { name: 'Attach Gripper progress will be lost' })
getByText('Attach Gripper progress will be lost')
getByText('Are you sure you want to exit before completing Attach Gripper?')
})

it('renders correct text for detach flow', () => {
const { getByRole, getByText } = render({
const { getByText } = render({
flowType: GRIPPER_FLOW_TYPES.DETACH,
})[0]
getByRole('heading', { name: 'Detach Gripper progress will be lost' })
getByText('Detach Gripper progress will be lost')
getByText('Are you sure you want to exit before completing Detach Gripper?')
})

it('renders correct text for recalibrate flow', () => {
const { getByRole, getByText } = render({
const { getByText } = render({
flowType: GRIPPER_FLOW_TYPES.RECALIBRATE,
})[0]
getByRole('heading', {
name: 'Gripper Recalibration progress will be lost',
})
getByText('Gripper Recalibration progress will be lost')
getByText(
'Are you sure you want to exit before completing Gripper Recalibration?'
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ describe('MountGripper', () => {
})

it('renders correct text', () => {
const { getByRole, getByText } = render()[0]
getByRole('heading', { name: 'Connect and Screw In Gripper' })
const { getByText } = render()[0]
getByText('Connect and Screw In Gripper')
getByText(
'Attach the gripper to the robot by alinging the connector and ensuring a secure connection. Hold the gripper in place and use the hex screwdriver to tighten the gripper screws. Then test that the gripper is securely attached by gently pulling it side to side.'
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('MovePin', () => {

it('renders correct text for move pin to front jaw', () => {
const { getByRole, getByText } = render()[0]
getByRole('heading', { name: 'Insert Calibration Pin into Front Jaw' })
getByText('Insert Calibration Pin into Front Jaw')
getByText(
'Take the calibration pin from its storage location. Magnetically attach the pin to the hole on the underside of the front gripper jaw.'
)
Expand All @@ -78,7 +78,7 @@ describe('MovePin', () => {
const { getByRole, getByText } = render({
movement: MOVE_PIN_FROM_FRONT_JAW_TO_REAR_JAW,
})[0]
getByRole('heading', { name: 'Insert Calibration Pin into Rear Jaw' })
getByText('Insert Calibration Pin into Rear Jaw')
getByText(
'Remove the calibration pin from the front jaw and attach it to the similar location on the rear jaw'
)
Expand All @@ -97,7 +97,7 @@ describe('MovePin', () => {
const { getByRole, getByText } = render({
movement: REMOVE_PIN_FROM_REAR_JAW,
})[0]
getByRole('heading', { name: 'Remove Calibration Pin' })
getByText('Remove Calibration Pin')
getByText(
'Take the calibration pin from the rear gripper jaw and return it to its storage location.'
)
Expand Down
22 changes: 12 additions & 10 deletions app/src/organisms/GripperWizardFlows/__tests__/Success.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,32 +43,34 @@ describe('Success', () => {
})

it('renders correct text for attached and calibrated', () => {
const { getByRole } = render({
const { getByRole, getByText } = render({
successfulAction: SUCCESSFULLY_ATTACHED_AND_CALIBRATED,
})[0]
getByRole('heading', {
name: 'Gripper Successfully Attached and Calibrated',
})
getByText('Gripper Successfully Attached and Calibrated')
getByRole('button', { name: 'exit' })
})

it('renders correct text for calibrated', () => {
const { getByRole } = render({
const { getByRole, getByText } = render({
successfulAction: SUCCESSFULLY_CALIBRATED,
})[0]
getByRole('heading', { name: 'Gripper Successfully Calibrated' })
getByText('Gripper Successfully Calibrated')
getByRole('button', { name: 'exit' })
})

it('renders correct text for attached', () => {
const { getByRole } = render({ successfulAction: SUCCESSFULLY_ATTACHED })[0]
getByRole('heading', { name: 'Gripper Successfully Attached' })
const { getByRole, getByText } = render({
successfulAction: SUCCESSFULLY_ATTACHED,
})[0]
getByText('Gripper Successfully Attached')
getByRole('button', { name: 'Calibrate gripper' })
})

it('renders correct text for detached', () => {
const { getByRole } = render({ successfulAction: SUCCESSFULLY_DETACHED })[0]
getByRole('heading', { name: 'Gripper Successfully Detached' })
const { getByText, getByRole } = render({
successfulAction: SUCCESSFULLY_DETACHED,
})[0]
getByText('Gripper Successfully Detached')
getByRole('button', { name: 'exit' })
})
})
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ describe('UnmountGripper', () => {
})

it('renders correct text', () => {
const { getByRole, getByText } = render()[0]
getByRole('heading', { name: 'Loosen Screws and Detach' })
const { getByText } = render()[0]
getByText('Loosen Screws and Detach')
getByText(
'Hold the gripper in place and loosen the screws. (The screws are captive and will not come apart from the gripper) Then carefully remove the gripper'
)
Expand Down