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

refactor(protocol-designer): adapter support for dropdown and update img #14094

Merged
merged 1 commit into from
Dec 5, 2023

Conversation

jerader
Copy link
Collaborator

@jerader jerader commented Dec 5, 2023

closes RAUT-891

Overview

This PR fixes a few misc things I found on edge:

  1. the dropdown menu for labware now takes into account if the labware is on an adapter on a module
  2. updates the announcement modal image to include the updated waste chute

Test Plan

Open PD and in dev tools, type localStorage.clear() to reset the hints. Refresh and see the announcement modal. should have an image with the correct waste chute fixture

Create a flex or OT-2 protocol. Add a Heater shaker. On the deck map, add an adapter and then a labware on top of the adapter. Either create a move labware, transfer, or mix step. The labware dropdown should include the module information with the labware display name.

Changelog

  • extend logic to account for adapters
  • update announcement modal img

Review requests

see test plan

Risk assessment

low

@jerader jerader requested review from a team, mjhuff and koji December 5, 2023 17:13
Copy link

codecov bot commented Dec 5, 2023

Codecov Report

Merging #14094 (59a8c1d) into edge (dcd6242) will increase coverage by 0.00%.
The diff coverage is 77.77%.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##             edge   #14094   +/-   ##
=======================================
  Coverage   70.46%   70.46%           
=======================================
  Files        2512     2512           
  Lines       71196    71203    +7     
  Branches     8958     8960    +2     
=======================================
+ Hits        50168    50173    +5     
- Misses      18837    18838    +1     
- Partials     2191     2192    +1     
Flag Coverage Δ
protocol-designer 45.01% <77.77%> (+0.02%) ⬆️

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

Files Coverage Δ
protocol-designer/src/ui/modules/utils.ts 50.00% <77.77%> (+5.17%) ⬆️

@koji
Copy link
Contributor

koji commented Dec 5, 2023

nit
I guess auto would be better for the announcement modal since for the following, the scroll bar isn't necessary.

Screenshot 2023-12-05 at 12 18 10 PM

Copy link
Contributor

@koji koji left a comment

Choose a reason for hiding this comment

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

left one comment but the changes worked as expected.

@jerader
Copy link
Collaborator Author

jerader commented Dec 5, 2023

nit I guess auto would be better for the announcement modal since for the following, the scroll bar isn't necessary.

thanks @koji! i think the scroll was used for a previous announcement modal. I'm going to leave it for now since PD will be reskinned next year!

@jerader jerader merged commit 3ef9cb5 into edge Dec 5, 2023
22 checks passed
@jerader jerader deleted the pd_misc-fixes-for-8.0 branch December 5, 2023 17:30
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