-
Notifications
You must be signed in to change notification settings - Fork 178
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): add resolve button for location conflicts with modules #14134
Conversation
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## chore_release-7.1.0 #14134 +/- ##
=======================================================
- Coverage 70.44% 70.35% -0.10%
=======================================================
Files 2512 2512
Lines 71201 71429 +228
Branches 8964 9074 +110
=======================================================
+ Hits 50161 50252 +91
- Misses 18849 18960 +111
- Partials 2191 2217 +26
Flags with carried forward coverage won't be shown. Click here to find out more.
|
}: RenderModuleStatusProps): JSX.Element { | ||
const { makeSnackbar } = useToaster() | ||
const { i18n, t } = useTranslation(['protocol_setup', 'module_setup_wizard']) | ||
const { i18n, t } = useTranslation(['protocol_setup', 'module_wizard_flows']) |
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.
apparently module_setup_wizard
doesn't exist 😅
) | ||
} else if ( | ||
isModuleReady && | ||
module.attachedModuleMatch?.moduleOffset?.last_modified != null | ||
) { | ||
moduleStatus = ( | ||
<> | ||
<Flex onClick={() => setShowLocationConflictModal(true)}> |
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.
why add this location conflict modal click for a ready module?
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.
oops good catch! fixing now!
closes RQA-2017
Overview
This PR updates the
update_deck
button in the app for a module location conflict to say "resolve". And then for the ODD, tweaks some things to add a button that says "resolve". See the ticket's image for details and refer to Rob's comment which is linked in the ticket.Test Plan
Test on the desktop app and the odd, use a protocol with a module and a fixture in the module slot.
Changelog
resolve
Review requests
see test plan
Risk assessment
low