fix(app): add resolve button for location conflicts with modules #14134
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jerader
requested review from
shlokamin and
a team
and removed request for
a team
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.
|
jerader
commented
Dec 7, 2023
| }: 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.
apparently module_setup_wizard doesn't exist 😅
jerader
changed the title
|
we need to be sure the module row columns stay aligned for all modules, otherwise looks good! 
|
brenthagen
approved these changes
Dec 8, 2023
| ) | ||
| } else if ( | ||
| isModuleReady && | ||
| module.attachedModuleMatch?.moduleOffset?.last_modified != null | ||
| ) { | ||
| moduleStatus = ( | ||
| <> | ||
| <Flex onClick={() => setShowLocationConflictModal(true)}> |
There was a problem hiding this comment.
why add this location conflict modal click for a ready module?
There was a problem hiding this comment.
oops good catch! fixing now!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes RQA-2017
Overview
This PR updates the
update_deckbutton 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
resolveReview requests
see test plan
Risk assessment
low