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.

Sign up for GitHub

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(protocol-designer, step-generation): x/Y tip positioning for asp, disp, mix #14758

Merged
merged 8 commits into from
Apr 3, 2024
Merged

feat(protocol-designer, step-generation): x/Y tip positioning for asp, disp, mix #14758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b077dad
refactor the form components
jerader Mar 29, 2024
d0abf5d
feat(protocol-designer, step-generation): x/Y tip positioning for asp…
jerader Mar 29, 2024
86c7d18
remove change
jerader Mar 29, 2024
0af24b7
fix cypress
jerader Mar 31, 2024
21244f3
fix rebase error
jerader Mar 31, 2024
1222e2e
prettier
jerader Mar 31, 2024
af80700
add some test coverage
jerader Apr 1, 2024
8a90c53
address comments
jerader Apr 2, 2024
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
4 changes: 2 additions & 2 deletions protocol-designer/cypress/integration/mixSettings.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ describe('Advanced Settings for Mix Form', () => {
cy.get('input[name="aspirate_flowRate"]').should('be.disabled')

// TipPosition Aspirate should be disabled
cy.get('[id=TipPositionField_mix_mmFromBottom]').should('be.disabled')
cy.get('[id=TipPositionIcon_mix_mmFromBottom]').should('not.be.enabled')

// Dispense Flowrate disbled
cy.get('input[name="dispense_flowRate"]').should('be.disabled')
Expand Down Expand Up @@ -91,7 +91,7 @@ describe('Advanced Settings for Mix Form', () => {
cy.get('input[name="dispense_flowRate"]').should('be.enabled')

// TipPosition Aspirate should be enabled
cy.get('[id=TipPositionField_mix_mmFromBottom]').should('be.enabled')
cy.get('[id=TipPositionIcon_mix_mmFromBottom]').should('not.be.disabled')

// Delay in aspirate and Dispense settings is enabled
cy.get('input[name="aspirate_delay_checkbox"]').should('be.enabled')
Expand Down
20 changes: 14 additions & 6 deletions protocol-designer/cypress/integration/transferSettings.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ describe('Advanced Settings for Transfer Form', () => {
it('Verify functionality of advanced settings with different pipette and labware', () => {
enterBatchEdit()

// Different Pipette disbales aspirate and dispense Flowrate and Mix settings
// Different Pipette disables aspirate and dispense Flowrate and Mix settings
// step 6 has different pipette than step 1
cy.get('[data-test="StepItem_6"]').click(batchEditClickOptions)

Expand All @@ -68,10 +68,14 @@ describe('Advanced Settings for Transfer Form', () => {
cy.get('input[name="aspirate_mix_checkbox"]').should('be.disabled')

// TipPosition Aspirate and Dispense should be disabled
cy.get('[id=TipPositionField_aspirate_mmFromBottom]').should('be.disabled')
cy.get('[id=TipPositionField_dispense_mmFromBottom]').should('be.disabled')
cy.get('[id=TipPositionIcon_aspirate_mmFromBottom]').should(
'not.be.enabled'
)
cy.get('[id=TipPositionIcon_dispense_mmFromBottom]').should(
'not.be.enabled'
)

// Dispense Flowrate and mix diabled
// Dispense Flowrate and mix disabled
cy.get('input[name="dispense_flowRate"]').should('be.disabled')
cy.get('input[name="dispense_mix_checkbox"]').should('be.disabled')

Expand Down Expand Up @@ -108,8 +112,12 @@ describe('Advanced Settings for Transfer Form', () => {
.should('be.empty')

// TipPosition Aspirate and Dispense should be enabled
cy.get('[id=TipPositionField_aspirate_mmFromBottom]').should('be.enabled')
cy.get('[id=TipPositionField_dispense_mmFromBottom]').should('be.enabled')
cy.get('[id=TipPositionIcon_aspirate_mmFromBottom]').should(
'not.be.disabled'
)
cy.get('[id=TipPositionIcon_dispense_mmFromBottom]').should(
'not.be.disabled'
)

// Delay in aspirate and Dispense settings is enabled
cy.get('input[name="aspirate_delay_checkbox"]').should('be.enabled')
Expand Down
Loading
Loading