Skip to content

Commit 0a79fa1

Browse files
authored
fix(protocol-designer): create_deck_fixture step form reducer to prop… (#18539)
…erly populate trash closes RQA-4249
1 parent de707b6 commit 0a79fa1

File tree

1 file changed

+24
-30
lines changed
  • protocol-designer/src/step-forms/reducers

1 file changed

+24
-30
lines changed

protocol-designer/src/step-forms/reducers/index.ts

Lines changed: 24 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -377,39 +377,33 @@ export const savedStepForms = (
377377
const prevInitialDeckSetupStep =
378378
savedStepForms[INITIAL_DECK_SETUP_STEP_ID]
379379
const locationUpdate = `${name}LocationUpdate`
380-
return mapValues(
381-
savedStepForms,
382-
(form: FormData): FormData => {
383-
if (form.stepType === 'manualIntervention') {
384-
return {
385-
...form,
386-
[INITIAL_DECK_SETUP_STEP_ID]: {
387-
...prevInitialDeckSetupStep,
388-
[locationUpdate]: {
389-
...prevInitialDeckSetupStep[locationUpdate],
390-
[id]: location,
391-
},
380+
return mapValues(savedStepForms, (savedForm: FormData, formId) => {
381+
if (formId === INITIAL_DECK_SETUP_STEP_ID) {
382+
return {
383+
...prevInitialDeckSetupStep,
384+
[locationUpdate]: {
385+
...prevInitialDeckSetupStep[locationUpdate],
386+
[id]: location,
387+
},
388+
}
389+
} else if (
390+
savedForm.dropTip_location == null &&
391+
(name === 'trashBin' || name === 'wasteChute')
392+
) {
393+
return {
394+
...savedForm,
395+
...handleFormChange(
396+
{
397+
dropTip_location: id,
392398
},
393-
}
394-
} else if (
395-
form.dropTip_location == null &&
396-
(name === 'trashBin' || name === 'wasteChute')
397-
) {
398-
return {
399-
...form,
400-
...handleFormChange(
401-
{
402-
dropTip_location: id,
403-
},
404-
form,
405-
_getPipetteEntitiesRootState(rootState),
406-
_getLabwareEntitiesRootState(rootState)
407-
),
408-
}
399+
savedForm,
400+
_getPipetteEntitiesRootState(rootState),
401+
_getLabwareEntitiesRootState(rootState)
402+
),
409403
}
410-
return form
411404
}
412-
)
405+
return savedForm
406+
})
413407
}
414408
case 'DELETE_DECK_FIXTURE': {
415409
const { id } = action.payload

0 commit comments

Comments
 (0)