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

fix(app): fix dqa ODD protocol setup deck config #14169

Merged
merged 8 commits into from
Dec 12, 2023

Conversation

koji
Copy link
Contributor

@koji koji commented Dec 11, 2023

Overview

fix ODD protocol setup deck config.
This PR will close the 2nd item, 3rd item, and 4th item in RAUT-834.

For Deck view height, it took from components/src/hardware-sim/DeckConfigurator/index.tsx
protocol setup
Screenshot 2023-12-12 at 1 31 52 PM

modules & deck
Screenshot 2023-12-12 at 1 32 04 PM

Test Plan

  • setup the following Protocol

96_ch Tip Drop 200uL_Tip Rack Drop Well Plate Drop Waste chute no cover (2).json.zip

Changelog

  • modify deck view size in ProtocolSetupDeckConfiguration
  • modify isLocationConflict's condition in ProtocolSetup
  • update currentDeckConfig, in ProtocolSetupDeckConfiguration

Review requests

I'd like to hear suggestion to fix Deck view size modification since I don't think the change in this pr is really good.

Risk assessment

low

fix ODD protocol setup deck config

close RAUT-834
@koji koji requested a review from a team December 11, 2023 23:41
Copy link

codecov bot commented Dec 11, 2023

Codecov Report

Merging #14169 (91e21bb) into chore_release-7.1.0 (3a93fc4) will decrease coverage by 0.12%.
Report is 12 commits behind head on chore_release-7.1.0.
The diff coverage is 66.66%.

Additional details and impacted files

Impacted file tree graph

@@                   Coverage Diff                   @@
##           chore_release-7.1.0   #14169      +/-   ##
=======================================================
- Coverage                70.46%   70.35%   -0.12%     
=======================================================
  Files                     2512     2512              
  Lines                    71220    71388     +168     
  Branches                  8974     9032      +58     
=======================================================
+ Hits                     50187    50224      +37     
- Misses                   18837    18964     +127     
- Partials                  2196     2200       +4     
Flag Coverage Δ
app 67.29% <66.66%> (-0.44%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
...organisms/ProtocolSetupDeckConfiguration/index.tsx 80.00% <66.66%> (-6.67%) ⬇️
.../src/pages/OnDeviceDisplay/ProtocolSetup/index.tsx 70.52% <66.66%> (-1.46%) ⬇️

... and 8 files with indirect coverage changes

@koji koji marked this pull request as ready for review December 11, 2023 23:59
@koji koji requested a review from a team as a code owner December 11, 2023 23:59
@koji koji requested review from jerader and removed request for a team and jerader December 11, 2023 23:59
@koji koji marked this pull request as draft December 12, 2023 00:45
@koji koji marked this pull request as ready for review December 12, 2023 18:47
@koji koji requested a review from brenthagen December 12, 2023 18:47
Copy link
Contributor

@brenthagen brenthagen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also in protocol_setup.json, to match figma should be
"multiple_fixtures_missing": "{count}} fixtures missing",

Copy link
Contributor

@brenthagen brenthagen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@koji koji merged commit 683b2a1 into chore_release-7.1.0 Dec 12, 2023
21 of 22 checks passed
@koji koji deleted the app_dqa-odd-protocolsetup-deckconfig branch April 17, 2024 19:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants