Skip to content

Commit bbeceb4

Browse files
ncdiehl11ncdiehl11
committed
Merge branch 'edge' into feat_pd-liquids-form
2 parents f122737 + 6f28b15 commit bbeceb4

File tree

85 files changed

+1685
-1438
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

85 files changed

+1685
-1438
lines changed

‎api/src/opentrons/protocol_engine/state/modules.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1198,7 +1198,10 @@ def select_hardware_module_to_load( # noqa: C901
11981198
else:
11991199
return m
12001200

1201-
raise errors.ModuleNotAttachedError(f"No available {model.value} found.")
1201+
raise errors.ModuleNotAttachedError(
1202+
f"No available {model.value} with {expected_serial_number or 'any'}"
1203+
" serial found."
1204+
)
12021205

12031206
def get_heater_shaker_movement_restrictors(
12041207
self,

‎components/src/atoms/Checkbox/index.tsx

+8-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { Icon } from '../../icons'
55
import {
66
ALIGN_CENTER,
77
CURSOR_AUTO,
8+
CURSOR_DEFAULT,
89
CURSOR_POINTER,
910
DIRECTION_ROW,
1011
FLEX_MAX_CONTENT,
@@ -66,8 +67,12 @@ export function Checkbox(props: CheckboxProps): JSX.Element {
6667
outline-offset: 2px;
6768
}
6869
&:disabled {
69-
background-color: ${COLORS.grey35};
70-
color: ${COLORS.grey50};
70+
background-color: ${COLORS.grey30};
71+
color: ${COLORS.grey40};
72+
cursor: ${CURSOR_DEFAULT};
73+
}
74+
&:disabled:hover {
75+
background-color: ${COLORS.grey30}; /* Prevent hover from overriding */
7176
}
7277
&:hover {
7378
background-color: ${isChecked ? COLORS.blue55 : COLORS.blue35};
@@ -93,7 +98,7 @@ export function Checkbox(props: CheckboxProps): JSX.Element {
9398
<StyledText desktopStyle="bodyDefaultRegular" oddStyle="bodyTextSemiBold">
9499
{labelText}
95100
</StyledText>
96-
<Check isChecked={isChecked} />
101+
<Check isChecked={isChecked} disabled={disabled} />
97102
</Flex>
98103
)
99104
}

‎protocol-designer/cypress/e2e/ProtocolDesignerModulesTest.cy.ts

+99
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
import { SetupActions, SetupVerifications } from '../support/SetupSteps'
2+
import { UniversalActions } from '../support/universalActions'
3+
import { ModActions, ModVerifications } from '../support/SupportModules'
4+
import { runSteps } from '../support/StepExecution'
5+
import type { StepsList } from '../support/StepExecution'
6+
7+
describe('The Redesigned Create Protocol Landing Page', () => {
8+
beforeEach(() => {
9+
cy.visit('/')
10+
cy.verifyHomePage()
11+
cy.closeAnalyticsModal()
12+
})
13+
14+
it('content and step 1 flow works', () => {
15+
cy.clickCreateNew()
16+
cy.verifyCreateNewHeader()
17+
const steps: StepsList = [
18+
SetupVerifications.OnStep1,
19+
SetupVerifications.FlexSelected,
20+
UniversalActions.Snapshot,
21+
SetupActions.SelectOT2,
22+
SetupVerifications.OT2Selected,
23+
UniversalActions.Snapshot,
24+
SetupActions.SelectFlex,
25+
SetupVerifications.FlexSelected,
26+
UniversalActions.Snapshot,
27+
SetupActions.Confirm,
28+
SetupVerifications.OnStep2,
29+
SetupActions.SingleChannelPipette50,
30+
SetupVerifications.StepTwo50uL,
31+
UniversalActions.Snapshot,
32+
SetupActions.Confirm,
33+
SetupVerifications.StepTwoPart3,
34+
UniversalActions.Snapshot,
35+
SetupActions.Confirm,
36+
SetupVerifications.OnStep3,
37+
SetupActions.YesGripper,
38+
SetupActions.Confirm,
39+
SetupVerifications.Step4Verification,
40+
SetupActions.AddThermocycler,
41+
SetupVerifications.ThermocyclerImg,
42+
SetupActions.AddHeaterShaker,
43+
SetupVerifications.HeaterShakerImg,
44+
SetupActions.AddMagBlock,
45+
SetupVerifications.MagBlockImg,
46+
SetupActions.AddTempdeck2,
47+
SetupVerifications.Tempdeck2Img,
48+
SetupActions.Confirm,
49+
SetupActions.Confirm,
50+
SetupActions.Confirm,
51+
SetupActions.EditProtocolA,
52+
SetupActions.ChoseDeckSlotC2,
53+
SetupActions.AddHardwareLabware,
54+
SetupActions.ClickLabwareHeader,
55+
SetupActions.ClickWellPlatesSection,
56+
SetupActions.SelectArmadillo96WellPlate,
57+
SetupActions.ChoseDeckSlotC2Labware,
58+
SetupActions.AddLiquid,
59+
SetupActions.ClickLiquidButton,
60+
SetupActions.DefineLiquid,
61+
SetupActions.LiquidSaveWIP,
62+
SetupActions.WellSelector,
63+
SetupActions.LiquidDropdown,
64+
SetupVerifications.LiquidPage,
65+
UniversalActions.Snapshot,
66+
SetupActions.SelectLiquidWells,
67+
SetupActions.SetVolumeAndSaveforWells,
68+
SetupActions.ChoseDeckSlotC1,
69+
SetupActions.EditHardwareLabwareOnDeck,
70+
SetupActions.ClickLabwareHeader,
71+
SetupActions.AddAdapters,
72+
SetupActions.DeepWellTempModAdapter,
73+
SetupActions.AddNest96DeepWellPlate,
74+
SetupActions.Done,
75+
SetupActions.ProtocolStepsH,
76+
SetupActions.AddStep,
77+
ModActions.AddTemperatureStep,
78+
ModVerifications.TempeDeckInitialForm,
79+
UniversalActions.Snapshot,
80+
ModActions.ActivateTempdeck,
81+
ModActions.InputTempDeck4,
82+
ModActions.SaveButtonTempdeck,
83+
ModActions.PauseAfterSettingTempdeck,
84+
// ModVerifications.Temp4CPauseTextVerification,
85+
UniversalActions.Snapshot,
86+
SetupActions.AddStep,
87+
ModActions.AddTemperatureStep,
88+
ModActions.ActivateTempdeck,
89+
ModActions.InputTempDeck95,
90+
ModActions.SaveButtonTempdeck,
91+
ModActions.PauseAfterSettingTempdeck,
92+
SetupActions.AddStep,
93+
ModActions.AddTemperatureStep,
94+
ModActions.ActivateTempdeck,
95+
ModActions.InputTempDeck100,
96+
]
97+
runSteps(steps)
98+
})
99+
})

‎protocol-designer/cypress/e2e/createNew.cy.ts

+24-18
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1-
import { Actions, Verifications, runCreateTest } from '../support/createNew'
1+
import { SetupActions, SetupVerifications } from '../support/SetupSteps'
22
import { UniversalActions } from '../support/universalActions'
33
import '../support/commands'
4+
// Every test is goign to use StepsList
5+
// Now every test will be a list of some combination of support
6+
// typescript file list of actions for specific PD stuff and include StepsList for steps
7+
8+
import { runSteps } from '../support/StepExecution'
9+
import type { StepsList } from '../support/StepExecution'
410

511
describe('The Redesigned Create Protocol Landing Page', () => {
612
beforeEach(() => {
@@ -11,29 +17,29 @@ describe('The Redesigned Create Protocol Landing Page', () => {
1117
it('content and step 1 flow works', () => {
1218
cy.verifyCreateNewHeader()
1319
cy.clickCreateNew()
14-
const steps: Array<Actions | Verifications | UniversalActions> = [
15-
Verifications.OnStep1,
16-
Verifications.FlexSelected,
20+
const steps: StepsList = [
21+
SetupVerifications.OnStep1,
22+
SetupVerifications.FlexSelected,
1723
UniversalActions.Snapshot,
18-
Actions.SelectOT2,
19-
Verifications.OT2Selected,
24+
SetupActions.SelectOT2,
25+
SetupVerifications.OT2Selected,
2026
UniversalActions.Snapshot,
21-
Actions.SelectFlex,
22-
Verifications.FlexSelected,
27+
SetupActions.SelectFlex,
28+
SetupVerifications.FlexSelected,
2329
UniversalActions.Snapshot,
24-
Actions.Confirm,
25-
Verifications.OnStep2,
26-
Verifications.NinetySixChannel,
30+
SetupActions.Confirm,
31+
SetupVerifications.OnStep2,
32+
SetupVerifications.NinetySixChannel,
2733
UniversalActions.Snapshot,
28-
Actions.GoBack,
29-
Verifications.OnStep1,
30-
Actions.SelectOT2,
31-
Actions.Confirm,
32-
Verifications.OnStep2,
33-
Verifications.NotNinetySixChannel,
34+
SetupActions.GoBack,
35+
SetupVerifications.OnStep1,
36+
SetupActions.SelectOT2,
37+
SetupActions.Confirm,
38+
SetupVerifications.OnStep2,
39+
SetupVerifications.NotNinetySixChannel,
3440
UniversalActions.Snapshot,
3541
]
3642

37-
runCreateTest(steps)
43+
runSteps(steps)
3844
})
3945
})

‎protocol-designer/cypress/e2e/createNewFlex.cy.ts

+55-52
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
import { Actions, Verifications, runCreateTest } from '../support/createNew'
1+
import { SetupActions, SetupVerifications } from '../support/SetupSteps'
22
import { UniversalActions } from '../support/universalActions'
3+
import '../support/commands'
4+
import { runSteps } from '../support/StepExecution'
5+
import type { StepsList } from '../support/StepExecution'
36

47
describe('The Redesigned Create Protocol Landing Page', () => {
58
beforeEach(() => {
@@ -10,63 +13,63 @@ describe('The Redesigned Create Protocol Landing Page', () => {
1013
it('content and step 1 flow works', () => {
1114
cy.clickCreateNew()
1215
cy.verifyCreateNewHeader()
13-
const steps: Array<Actions | Verifications | UniversalActions> = [
14-
Verifications.OnStep1,
15-
Verifications.FlexSelected,
16+
const steps: StepsList = [
17+
SetupVerifications.OnStep1,
18+
SetupVerifications.FlexSelected,
1619
UniversalActions.Snapshot,
17-
Actions.SelectOT2,
18-
Verifications.OT2Selected,
20+
SetupActions.SelectOT2,
21+
SetupVerifications.OT2Selected,
1922
UniversalActions.Snapshot,
20-
Actions.SelectFlex,
21-
Verifications.FlexSelected,
23+
SetupActions.SelectFlex,
24+
SetupVerifications.FlexSelected,
2225
UniversalActions.Snapshot,
23-
Actions.Confirm,
24-
Verifications.OnStep2,
25-
Actions.SingleChannelPipette50,
26-
Verifications.StepTwo50uL,
26+
SetupActions.Confirm,
27+
SetupVerifications.OnStep2,
28+
SetupActions.SingleChannelPipette50,
29+
SetupVerifications.StepTwo50uL,
2730
UniversalActions.Snapshot,
28-
Actions.Confirm,
29-
Verifications.StepTwoPart3,
31+
SetupActions.Confirm,
32+
SetupVerifications.StepTwoPart3,
3033
UniversalActions.Snapshot,
31-
Actions.Confirm,
32-
Verifications.OnStep3,
33-
Actions.YesGripper,
34-
Actions.Confirm,
35-
Verifications.Step4Verification,
36-
Actions.AddThermocycler,
37-
Verifications.ThermocyclerImg,
38-
Actions.AddHeaterShaker,
39-
Verifications.HeaterShakerImg,
40-
Actions.AddMagBlock,
41-
Verifications.MagBlockImg,
42-
Actions.AddTempdeck2,
43-
Verifications.Tempdeck2Img,
44-
Actions.Confirm,
45-
Actions.Confirm,
46-
Actions.Confirm,
47-
Actions.EditProtocolA,
48-
Actions.ChoseDeckSlotC2,
49-
Actions.AddHardwareLabware,
50-
Actions.ClickLabwareHeader,
51-
Actions.ClickWellPlatesSection,
52-
Actions.SelectArmadillo96WellPlate,
53-
Actions.ChoseDeckSlotC2Labware,
54-
Actions.AddLiquid,
55-
Actions.ClickLiquidButton,
56-
Actions.DefineLiquid,
57-
Actions.LiquidSaveWIP,
58-
Actions.WellSelector,
59-
Actions.LiquidDropdown,
60-
Verifications.LiquidPage,
34+
SetupActions.Confirm,
35+
SetupVerifications.OnStep3,
36+
SetupActions.YesGripper,
37+
SetupActions.Confirm,
38+
SetupVerifications.Step4Verification,
39+
SetupActions.AddThermocycler,
40+
SetupVerifications.ThermocyclerImg,
41+
SetupActions.AddHeaterShaker,
42+
SetupVerifications.HeaterShakerImg,
43+
SetupActions.AddMagBlock,
44+
SetupVerifications.MagBlockImg,
45+
SetupActions.AddTempdeck2,
46+
SetupVerifications.Tempdeck2Img,
47+
SetupActions.Confirm,
48+
SetupActions.Confirm,
49+
SetupActions.Confirm,
50+
SetupActions.EditProtocolA,
51+
SetupActions.ChoseDeckSlotC2,
52+
SetupActions.AddHardwareLabware,
53+
SetupActions.ClickLabwareHeader,
54+
SetupActions.ClickWellPlatesSection,
55+
SetupActions.SelectArmadillo96WellPlate,
56+
SetupActions.ChoseDeckSlotC2Labware,
57+
SetupActions.AddLiquid,
58+
SetupActions.ClickLiquidButton,
59+
SetupActions.DefineLiquid,
60+
SetupActions.LiquidSaveWIP,
61+
SetupActions.WellSelector,
62+
SetupActions.LiquidDropdown,
63+
SetupVerifications.LiquidPage,
6164
UniversalActions.Snapshot,
62-
Actions.SelectLiquidWells,
63-
Actions.SetVolumeAndSaveforWells,
64-
Actions.ChoseDeckSlotC3,
65-
Actions.AddHardwareLabware,
66-
Actions.ClickLabwareHeader,
67-
Actions.ClickWellPlatesSection,
68-
Actions.SelectBioRad96WellPlate,
65+
SetupActions.SelectLiquidWells,
66+
SetupActions.SetVolumeAndSaveforWells,
67+
SetupActions.ChoseDeckSlotC3,
68+
SetupActions.AddHardwareLabware,
69+
SetupActions.ClickLabwareHeader,
70+
SetupActions.ClickWellPlatesSection,
71+
SetupActions.SelectBioRad96WellPlate,
6972
]
70-
runCreateTest(steps)
73+
runSteps(steps)
7174
})
7275
})

0 commit comments

Comments
 (0)