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): don't doublecount labware on modules #6246

Merged
merged 2 commits into from
Aug 3, 2020

Conversation

sfoster1
Copy link
Member

If you have a labware on a module, and another of that labware on the
deck, the app will display (x2) next to the entry for the labware on the
deck in the file info panel. This is becaues of too-loose matching on
parent in a new selector. Tighten up that matching so labware on modules
doesn't get doublecounted.

Testing

  • Load a protocol that has the same labware on the module and the deck
  • Make sure the quantities in the file info page are correct

If you have a labware on a module, and another of that labware on the
deck, the app will display (x2) next to the entry for the labware on the
deck in the file info panel. This is becaues of too-loose matching on
parent in a new selector. Tighten up that matching so labware on modules
doesn't get doublecounted.
@sfoster1 sfoster1 added app Affects the `app` project fix PR fixes a bug labels Jul 31, 2020
@sfoster1 sfoster1 requested a review from b-cooper July 31, 2020 14:45
@sfoster1 sfoster1 requested a review from a team as a code owner July 31, 2020 14:45
@mcous
Copy link
Contributor

mcous commented Aug 1, 2020

Oops, didn't recognize this bug when I combined these filters into one utility. My bad. You should add a unit test for this quantity behavior to the selector test; the one that's there for quantity clearly isn't enough

Copy link
Contributor

@Laura-Danielle Laura-Danielle left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks for the fix

@codecov
Copy link

codecov bot commented Aug 3, 2020

Codecov Report

❗ No coverage uploaded for pull request base (edge@1886fd1). Click here to learn what that means.
The diff coverage is 100.00%.

Impacted file tree graph

@@           Coverage Diff           @@
##             edge    #6246   +/-   ##
=======================================
  Coverage        ?   55.41%           
=======================================
  Files           ?     1035           
  Lines           ?    16053           
  Branches        ?        0           
=======================================
  Hits            ?     8896           
  Misses          ?     7157           
  Partials        ?        0           
Impacted Files Coverage Δ
app/src/calibration/labware/selectors.js 100.00% <100.00%> (ø)
app/src/pages/Calibrate/Pipettes.js 0.00% <0.00%> (ø)
components/src/deck/Tip.js 0.00% <0.00%> (ø)
app/src/shell/remote.js 0.00% <0.00%> (ø)
...esigner/src/components/steplist/ModuleStepItems.js 100.00% <0.00%> (ø)
app/src/components/PrepareModules/index.js 0.00% <0.00%> (ø)
...gner/src/components/portals/MainPageModalPortal.js 0.00% <0.00%> (ø)
protocol-designer/src/file-types.js 0.00% <0.00%> (ø)
...eneration/commandCreators/atomic/setTemperature.js 84.61% <0.00%> (ø)
...designer/src/components/FileSidebar/FileSidebar.js 81.25% <0.00%> (ø)
... and 1026 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1886fd1...c425f3e. Read the comment docs.

@sfoster1 sfoster1 merged commit 837f153 into edge Aug 3, 2020
@sfoster1 sfoster1 deleted the app_fix-lw-quantity-modules branch August 3, 2020 17:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
app Affects the `app` project fix PR fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants