-
Notifications
You must be signed in to change notification settings - Fork 179
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
feat(app): wire up location conflict modal for ODD #13797
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## edge #13797 +/- ##
==========================================
+ Coverage 70.74% 70.76% +0.01%
==========================================
Files 2468 2469 +1
Lines 69459 69565 +106
Branches 8373 8405 +32
==========================================
+ Hits 49139 49226 +87
- Misses 18348 18361 +13
- Partials 1972 1978 +6
Flags with carried forward coverage won't be shown. Click here to find out more.
|
app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx
Outdated
Show resolved
Hide resolved
<Flex | ||
padding={SPACING.spacing24} | ||
backgroundColor={COLORS.light1} | ||
flexDirection={DIRECTION_ROW} | ||
alignItems={ALIGN_CENTER} | ||
justifyContent={JUSTIFY_SPACE_BETWEEN} | ||
borderRadius={BORDERS.borderRadiusSize3} | ||
> | ||
<StyledText as="p" fontWeight={TYPOGRAPHY.fontWeightSemiBold}> | ||
{t('protocol_specifies')} | ||
</StyledText> | ||
|
||
<StyledText as="p"> | ||
{requiredFixture && getFixtureDisplayName(requiredFixture)} | ||
{requiredModule && getModuleDisplayName(requiredModule)} | ||
</StyledText> | ||
</Flex> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For this part, we can use ListItem (app/src/atoms/ListItem).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
<ListItem type="noActive">
<Flex flexDirection={DIRECTION_ROW} justifyContent={JUSTIFY_SPACE_BETWEEN}>
<StyledText as="p" fontWeight={TYPOGRAPHY.fontWeightSemiBold}>
{t('protocol_specifies')}
</StyledText>
<StyledText as="p">
{requiredFixture && getFixtureDisplayName(requiredFixture)}
{requiredModule && getModuleDisplayName(requiredModule)}
</StyledText>
<Flex>
</ListItem>
I should update ListItem
since currently it supports only one text case and need to pass noActive
as the default type.
ListItem was created when I worked on E-stop modal.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm
I just left a couple of comments.
sorry mistakenly clicked close instead of comment. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
a couple minor comments, LGTM !
app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx
Outdated
Show resolved
Hide resolved
app/src/organisms/Devices/ProtocolRun/SetupModuleAndDeck/LocationConflictModal.tsx
Outdated
Show resolved
Hide resolved
f2016b8
to
1cfa446
Compare
* edge: (77 commits) fix(app): update move gantry text in change pipette flow (#13712) fix(app): fix CI after release merge back (#13816) chore(hardware): add opentrons hardware package to ot 2 build (#13770) feat(protocol-designer): correct step count in create file wizard (#13807) feat(protocol-designer): error handling in create file wizard (#13804) fix(app): invalidate OT2 calibration queries when calibration flows complete (#13809) always jog (#13806) chore(app): point updates at dns not s3 (#13798) docs(api): updated Flex default flow rates (#13796) fix(api): Flag pipette as not ready to aspirate after pushing out air (#13728) fix(api, hardware): allow OT3Controller to disable tip motors (#13805) more blank trials; longer scale stabilize wait; submerge 2.5mm (#13788) fix(app): unload adapters after checking position of labware on adapter on heater shaker module (#13803) feat(app): wire up location conflict modal for ODD (#13797) feat(app): add Deck configuration page component (#13784) fix(robot-server): add default to robot serial (#13802) feat(protocol-designer, components): prep work for deck config in PD (#13775) feat(app, protocol-designer): plug in waste chute asset (#13800) fix(app): do not check mag block in calibration status (#13799) feat(protocol-designer): edit additional items staging area support (#13752) ...
closes RAUT-673
Overview
This PR wires up the location conflict modal for the ODD and changes the modal to match ODD designs. Additionally, the
ProtocolSetupModules
folder and component is renamed toProtooclSetupModulesAndDeck
Test Plan
Test on an ODD, go to protocol setup and with a location conflict for fixture and module, click the row to reveal the modal. Make sure the modal works and looks as expected.
Changelog
ProtocolSetupModules
component toProtocolSetupModulesAndDeck
Review requests
see test plan
Risk assessment
low