fix(app): mag block with staging area location conflict, handle no configurable modules #15043
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
… fixture name At the beginning of the module calibration flow, the user is asked to locate the module on the deck. This integrated the deck configurator component directly into this location selction step of the module calibration wizard. the selected location will now be saved directly to deck configuration. Closes RQA-2603
…g protocol setup on ODD Resolve location conflicts in the on device display's protocol setup flow by updating deck configuration accordingly. Closes PLAT-287
…on odd and desktop
…nfigurable modules Add special-case affordances for the magnetic block with staging area slot fixture in the protocol setup for run experience on the ODD and desktop. Show different modals depending on the presence of matching but configured modules in the ChooseModuleToConfigure conflict resolution experience on ODD and desktop Closes PLAT-298, Closes PLAT-293, Closes PLAT-294
brenthagen
reviewed
Apr 30, 2024
| @@ -65,6 +68,9 @@ export type ProtocolHardware = | |||
| | ProtocolFixture | |||
|
|
|||
| const DECK_CONFIG_REFETCH_INTERVAL = 5000 | |||
| const USB_MODULE_ADDRESSABLE_AREAS = FLEX_MODULE_ADDRESSABLE_AREAS.filter( | |||
There was a problem hiding this comment.
can use FLEX_USB_MODULE_ADDRESSABLE_AREAS constant directly?
brenthagen
reviewed
Apr 30, 2024
| } | ||
| function NoUnconfiguredModules(props: NoUnconfiguredModulesProps): JSX.Element { | ||
| const { moduleDisplayName, displaySlotName, isOnDevice, robotName } = props | ||
| const configuredModuleMatches = ['feer'] |
brenthagen
reviewed
Apr 30, 2024
| slot: displaySlotName, | ||
| })} | ||
| </StyledText> | ||
| {loadingBlock} |
There was a problem hiding this comment.
is no exit button on this version intentional?
There was a problem hiding this comment.
That's correct, the exit button in the top left is the only action the user can take in this case (other than plugging in a module of the specified model)
brenthagen
reviewed
Apr 30, 2024
Comment on lines
+243
to
+247
| ).filter( | ||
| loadedModule => | ||
| // filter out magnetic block which is already handled by the required fixture details | ||
| getModuleType(loadedModule.params.model) !== MAGNETIC_BLOCK_TYPE | ||
| ) |
There was a problem hiding this comment.
need to filter out the other modules also, they are rendering twice in the RobotConfigurationDetails list
There was a problem hiding this comment.
or maybe filter all modules out of requiredFixtureDetails instead
brenthagen
reviewed
Apr 30, 2024
Comment on lines
102
to
107
| if ( | ||
| protocolHardware.cutoutFixtureId === | ||
| STAGING_AREA_SLOT_WITH_MAGNETIC_BLOCK_V1_FIXTURE | ||
| ) { | ||
| displayFixtureId = STAGING_AREA_RIGHT_SLOT_FIXTURE | ||
| } |
There was a problem hiding this comment.
discussed IRL, don't want to assign STAGING_AREA_RIGHT_SLOT_FIXTURE here
Carlos-fernandez
pushed a commit
that referenced
this pull request
May 20, 2024
…nfigurable modules (#15043) Add special-case affordances for the magnetic block with staging area slot fixture in the protocol setup for run experience on the ODD and desktop. Show different modals depending on the presence of matching but configured modules in the ChooseModuleToConfigure conflict resolution experience on ODD and desktop Closes [PLAT-298](https://opentrons.atlassian.net/browse/PLAT-298), Closes [PLAT-293](https://opentrons.atlassian.net/browse/PLAT-293), Closes [PLAT-294](https://opentrons.atlassian.net/browse/PLAT-294), Closes [RQA-2670](https://opentrons.atlassian.net/browse/RQA-2670)
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.
Overview
Add special-case affordances for the magnetic block with staging area slot fixture in the protocol
setup for run experience on the ODD and desktop. Show different modals depending on the presence of
matching but configured modules in the ChooseModuleToConfigure conflict resolution experience on ODD
and desktop
Closes PLAT-298, Closes PLAT-293, Closes PLAT-294
Closes RQA-2670
Review requests
Start protocol setup with a protocol that specs the mag block in a slot adjacent to a column 4 slot that is also used in the protocol. Confirm ODD and desktop setup items render properly and location conflict modal resolves as expected
Start protocol setup for a protocol that uses a module that is not currently configured or attached.
Start protocol setup for a protocol that uses a module that is configured into a different location than the protocol expects.
Risk assessment
low