Skip to content

Commit af13f7d

Browse files
ahiuchingauahiuchingau
committed
rename route and fix make sure we set handleMotionRouting as false
1 parent 001f1ff commit af13f7d

13 files changed

+43
-47
lines changed

‎app/src/organisms/ErrorRecoveryFlows/ErrorRecoveryWizard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@ export function ErrorRecoveryContent(props: RecoveryContentProps): JSX.Element {
322322
case RECOVERY_MAP.ROBOT_PICKING_UP_TIPS.ROUTE:
323323
case RECOVERY_MAP.ROBOT_SKIPPING_STEP.ROUTE:
324324
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE.ROUTE:
325-
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE:
325+
case RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE:
326326
return buildRecoveryInProgress()
327327
case RECOVERY_MAP.ROBOT_DOOR_OPEN.ROUTE:
328328
return buildManuallyRouteToDoorOpen()

‎app/src/organisms/ErrorRecoveryFlows/RecoveryDoorOpen.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ export function RecoveryDoorOpen({
6464
case RECOVERY_MAP.STACKER_STALLED_SKIP.ROUTE:
6565
case RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.ROUTE:
6666
case RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.ROUTE:
67-
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE:
67+
case RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE:
6868
return t('stacker_door_open_robot_home')
6969
default:
7070
return t('close_the_robot_door')
@@ -80,7 +80,7 @@ export function RecoveryDoorOpen({
8080
case RECOVERY_MAP.STACKER_STALLED_SKIP.ROUTE:
8181
case RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.ROUTE:
8282
case RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.ROUTE:
83-
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE:
83+
case RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE:
8484
return t('close_robot_and_stacker_door')
8585
default:
8686
return t('robot_door_is_open')
@@ -96,7 +96,7 @@ export function RecoveryDoorOpen({
9696
case RECOVERY_MAP.STACKER_STALLED_SKIP.ROUTE:
9797
case RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.ROUTE:
9898
case RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.ROUTE:
99-
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE:
99+
case RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE:
100100
return t('continue')
101101
default:
102102
return t('resume')

‎app/src/organisms/ErrorRecoveryFlows/RecoveryInProgress.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export function RecoveryInProgress({
3232
ROBOT_PICKING_UP_TIPS,
3333
ROBOT_SKIPPING_STEP,
3434
ROBOT_RELEASING_LABWARE,
35-
ROBOT_RELEASING_LABWARE_LATCH,
35+
STACKER_RELEASING_LABWARE_LATCH,
3636
} = RECOVERY_MAP
3737
const { t } = useTranslation('error_recovery')
3838
const { route } = recoveryMap
@@ -68,7 +68,7 @@ export function RecoveryInProgress({
6868
return t('gripper_releasing_labware')
6969
}
7070
}
71-
case ROBOT_RELEASING_LABWARE_LATCH.ROUTE: {
71+
case STACKER_RELEASING_LABWARE_LATCH.ROUTE: {
7272
if (releaseCountdown > 0) {
7373
return t('latch_will_release_in_s', {
7474
seconds: releaseCountdown,
@@ -189,7 +189,7 @@ export function useReleaseLabware({
189189
let intervalId: NodeJS.Timeout | null = null
190190
switch (recoveryMap.route) {
191191
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE.ROUTE:
192-
case RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE:
192+
case RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE:
193193
intervalId = setInterval(() => {
194194
setCountdown(prevCountdown => {
195195
const updatedCountdown = prevCountdown - 1
@@ -200,10 +200,12 @@ export function useReleaseLabware({
200200
}
201201
if (
202202
recoveryMap.route ===
203-
RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE
203+
RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE
204204
) {
205205
void releaseLabwareLatch().then(() => {
206-
proceedToValidNextStep()
206+
return handleMotionRouting(false).then(() => {
207+
proceedToValidNextStep()
208+
})
207209
})
208210
} else {
209211
void releaseGripperJaws().then(() => {

‎app/src/organisms/ErrorRecoveryFlows/__tests__/RecoveryDoorOpen.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ describe('RecoveryDoorOpen', () => {
7676
RECOVERY_MAP.STACKER_STALLED_SKIP.ROUTE,
7777
RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.ROUTE,
7878
RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.ROUTE,
79-
RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE,
79+
RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE,
8080
]
8181

8282
// Routes that should return the door open text.

‎app/src/organisms/ErrorRecoveryFlows/__tests__/RecoveryInProgress.test.tsx

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ describe('RecoveryInProgress', () => {
2929
ROBOT_PICKING_UP_TIPS,
3030
ROBOT_SKIPPING_STEP,
3131
ROBOT_RELEASING_LABWARE,
32-
ROBOT_RELEASING_LABWARE_LATCH,
32+
STACKER_RELEASING_LABWARE_LATCH,
3333
} = RECOVERY_MAP
3434
let props: ComponentProps<typeof RecoveryInProgress>
3535

@@ -137,12 +137,12 @@ describe('RecoveryInProgress', () => {
137137
screen.getByText('Gripper will release labware in 3 seconds')
138138
})
139139

140-
it(`renders appropriate copy when the route is ${ROBOT_RELEASING_LABWARE_LATCH.ROUTE}`, () => {
140+
it(`renders appropriate copy when the route is ${STACKER_RELEASING_LABWARE_LATCH.ROUTE}`, () => {
141141
props = {
142142
...props,
143143
recoveryMap: {
144-
route: ROBOT_RELEASING_LABWARE_LATCH.ROUTE,
145-
step: ROBOT_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
144+
route: STACKER_RELEASING_LABWARE_LATCH.ROUTE,
145+
step: STACKER_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
146146
},
147147
}
148148
render(props)
@@ -181,8 +181,8 @@ describe('RecoveryInProgress', () => {
181181
props = {
182182
...props,
183183
recoveryMap: {
184-
route: ROBOT_RELEASING_LABWARE_LATCH.ROUTE,
185-
step: ROBOT_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
184+
route: STACKER_RELEASING_LABWARE_LATCH.ROUTE,
185+
step: STACKER_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
186186
},
187187
}
188188
render(props)
@@ -266,12 +266,12 @@ describe('useReleaseLabware', () => {
266266
},
267267
{
268268
recoveryOption: RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.ROUTE,
269-
currentRoute: RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE,
269+
currentRoute: RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE,
270270
nextStep: RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.STEPS.REENGAGE_LATCH,
271271
},
272272
{
273273
recoveryOption: RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.ROUTE,
274-
currentRoute: RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE,
274+
currentRoute: RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE,
275275
nextStep: RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.STEPS.REENGAGE_LATCH,
276276
},
277277
])(

‎app/src/organisms/ErrorRecoveryFlows/constants.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ export const RECOVERY_MAP = {
118118
RELEASING_LABWARE: 'releasing-labware',
119119
},
120120
},
121-
ROBOT_RELEASING_LABWARE_LATCH: {
122-
ROUTE: 'robot-releasing-labware-latch',
121+
STACKER_RELEASING_LABWARE_LATCH: {
122+
ROUTE: 'stacker-releasing-labware-latch',
123123
STEPS: {
124124
RELEASING_LABWARE_LATCH: 'releasing-labware-latch',
125125
},
@@ -327,7 +327,7 @@ const {
327327
ROBOT_CANCELING,
328328
ROBOT_PICKING_UP_TIPS,
329329
ROBOT_RELEASING_LABWARE,
330-
ROBOT_RELEASING_LABWARE_LATCH,
330+
STACKER_RELEASING_LABWARE_LATCH,
331331
ROBOT_RESUMING,
332332
ROBOT_IN_MOTION,
333333
ROBOT_RETRYING_STEP,
@@ -381,8 +381,8 @@ export const STEP_ORDER: StepOrder = {
381381
[ROBOT_RELEASING_LABWARE.ROUTE]: [
382382
ROBOT_RELEASING_LABWARE.STEPS.RELEASING_LABWARE,
383383
],
384-
[ROBOT_RELEASING_LABWARE_LATCH.ROUTE]: [
385-
ROBOT_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
384+
[STACKER_RELEASING_LABWARE_LATCH.ROUTE]: [
385+
STACKER_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
386386
],
387387
[ROBOT_RESUMING.ROUTE]: [ROBOT_RESUMING.STEPS.RESUMING],
388388
[ROBOT_RETRYING_STEP.ROUTE]: [ROBOT_RETRYING_STEP.STEPS.RETRYING],
@@ -541,8 +541,8 @@ export const RECOVERY_MAP_METADATA: RecoveryRouteStepMetadata = {
541541
[ROBOT_RELEASING_LABWARE.ROUTE]: {
542542
[ROBOT_RELEASING_LABWARE.STEPS.RELEASING_LABWARE]: { allowDoorOpen: false },
543543
},
544-
[ROBOT_RELEASING_LABWARE_LATCH.ROUTE]: {
545-
[ROBOT_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH]: {
544+
[STACKER_RELEASING_LABWARE_LATCH.ROUTE]: {
545+
[STACKER_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH]: {
546546
allowDoorOpen: true,
547547
},
548548
},
@@ -809,12 +809,12 @@ export const GRIPPER_MOVE_STEPS: RouteStep[] = [
809809
RECOVERY_MAP.MANUAL_REPLACE_AND_RETRY.STEPS.MANUAL_REPLACE,
810810
]
811811

812-
export const REENGAGE_LATCH_ROUTES: RouteStep[] = [
812+
export const STACKER_LATCH_STEPS: RouteStep[] = [
813813
RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.STEPS.RELEASE_FROM_LATCH,
814814
RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_SKIP.STEPS.REENGAGE_LATCH,
815815
RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.STEPS.RELEASE_FROM_LATCH,
816816
RECOVERY_MAP.STACKER_SHUTTLE_EMPTY_RETRY.STEPS.REENGAGE_LATCH,
817-
ROBOT_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
817+
STACKER_RELEASING_LABWARE_LATCH.STEPS.RELEASING_LABWARE_LATCH,
818818
]
819819

820820
export const INVALID = 'INVALID' as const

‎app/src/organisms/ErrorRecoveryFlows/hooks/__tests__/useRecoveryToasts.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ describe('handleRecoveryOptionAction', () => {
338338
RECOVERY_MAP.ROBOT_DOOR_OPEN.ROUTE,
339339
RECOVERY_MAP.ROBOT_DOOR_OPEN_SPECIAL.ROUTE,
340340
RECOVERY_MAP.OPTION_SELECTION.ROUTE,
341-
RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE,
341+
RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE,
342342
]
343343

344344
it.each(NEXT_STEP_ROUTES)('should return nextStepReturnVal for %s', route => {

‎app/src/organisms/ErrorRecoveryFlows/hooks/useRouteUpdateActions.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
GRIPPER_MOVE_STEPS,
77
INVALID,
88
RECOVERY_MAP,
9+
STACKER_LATCH_STEPS,
910
STEP_ORDER,
1011
} from '../constants'
1112

@@ -109,10 +110,14 @@ export function useRouteUpdateActions(
109110
)
110111

111112
// If the door is permitted on the current step, but the robot is about to move, we need to manually redirect users
112-
// to the door modal unless the step is specifically a gripper jaw release step.
113+
// to the door modal unless the step is specifically a gripper jaw/stacker latch release step.
113114
const checkDoorStatus = useCallback((): Promise<void> => {
114115
return new Promise((resolve, reject) => {
115-
if (isDoorOpen && !GRIPPER_MOVE_STEPS.includes(currentStep)) {
116+
if (
117+
isDoorOpen &&
118+
!GRIPPER_MOVE_STEPS.includes(currentStep) &&
119+
!STACKER_LATCH_STEPS.includes(currentStep)
120+
) {
116121
stashedMapRef.current = { route: currentRoute, step: currentStep }
117122

118123
setRecoveryMap({

‎app/src/organisms/ErrorRecoveryFlows/shared/ReleaseLabware.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export function ReleaseLabware({
4343
case STACKER_SHUTTLE_EMPTY_SKIP.ROUTE:
4444
void handleMotionRouting(
4545
true,
46-
RECOVERY_MAP.ROBOT_RELEASING_LABWARE_LATCH.ROUTE
46+
RECOVERY_MAP.STACKER_RELEASING_LABWARE_LATCH.ROUTE
4747
)
4848
break
4949
default:

‎app/src/organisms/ErrorRecoveryFlows/shared/StackerReengageLatch.tsx

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { useTranslation } from 'react-i18next'
33
import ReengageLatch from '/app/assets/images/flex_stacker_reengage_latch.png'
44
import { DescriptionContent, TwoColumn } from '/app/molecules/InterventionModal'
55

6-
import { RECOVERY_MAP } from '../constants'
76
import { RecoverySingleColumnContentWrapper } from './RecoveryContentWrapper'
87
import { RecoveryFooterButtons } from './RecoveryFooterButtons'
98

@@ -16,17 +15,12 @@ export function StackerReengageLatch(props: RecoveryContentProps): JSX.Element {
1615
const {
1716
proceedNextStep,
1817
goBackPrevStep,
19-
handleMotionRouting,
2018
} = routeUpdateActions
2119
const { closeLabwareLatch } = recoveryCommands
22-
const { ROBOT_IN_MOTION } = RECOVERY_MAP
2320

2421
const primaryOnClick = (): void => {
25-
void handleMotionRouting(true, ROBOT_IN_MOTION.ROUTE).then(() => {
26-
void closeLabwareLatch().then(() => {
27-
void proceedNextStep()
28-
})
29-
})
22+
void closeLabwareLatch()
23+
.then(() => { void proceedNextStep() })
3024
}
3125

3226
return (

0 commit comments

Comments
 (0)