refactor(app): add and use deck map component in interventionmodal #15570
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
sfoster1
force-pushed
the
exec-501-deckmap-content
branch
from
e28fb73
to
12b4a70
Compare
| }, | ||
| ] | ||
|
|
||
| const CONSOLE_LOG_ON_SELECT = (location: ModuleLocation): void => { |
| @@ -44,7 +44,7 @@ export function useRunPausedSplash( | |||
| showERWizard: boolean | |||
| ): boolean { | |||
| // Don't show the splash when desktop ER wizard is active. | |||
| return !(!isOnDevice && showERWizard) | |||
| return isOnDevice && !showERWizard | |||
| modulesOnDeck: RunCurrentModulesOnDeck[] | ||
| labwareOnDeck: RunCurrentLabwareOnDeck[] | ||
| highlightLabwareEventuallyIn: string[] | ||
| kind: 'intervention' |
There was a problem hiding this comment.
just want to make sure we always want the kind to be intervention?
There was a problem hiding this comment.
yeah. in this case we do because this is only picked up by error recovery use cases which always use that style of deck map. the deck config style is only used by the drop tip wiz
TamarZanzouri
approved these changes
Jul 3, 2024
sfoster1
force-pushed
the
exec-501-deckmap-content
branch
from
cbadbc1
to
13dc511
Compare
We're probably going to use this a lot more now that we'll have a bunch of content components that live in TwoColumn, so let's make StandIn reusable.
add deckmap fixtures and such more deckmap changes
my own? my... precious?
This should be a visually indistinguishable reimplementation.
Two places in error recovery, refactoring as we go. One big change was that there was a bunch of stuff called RecoveryMap as in recovery (deck) map, but recovery also has the Recovery Map, the big data structure that holds how all the steps of error recovery flow together. This is very confusing, so now what used to be RecoveryMap (component, utils) is now DeckMap.
sfoster1
force-pushed
the
exec-501-deckmap-content
branch
from
13dc511
to
67a36a8
Compare
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.
Adds DeckMapContent to intervention modal. This is a small wrapper around one of two different kinds of deck map:
Stories for the deckmap are on storybook, where it's rendered side-by-side with the standin since it is only destined to be used in a two-column layout.
Extra fun changes:
BaseDeck, because otherwise they are completely unreadable once the deckmap gets to small. I think this looks a lot better everywhere, and is actually readable when the deckmap is small, so let's go with it; may want to come back and make these something more specific on desktopRecoveryMap, a large data structure that is core to the wizard flow and defines how users move between steps and screens. Error recovery also had aRecoveryMap, which was a component for rendering a deckmap, and auseRecoveryMapUtils, a hook for getting that component's arguments. Now it uses theDeckMapContentcomponent above directly, anduseDeckMapUtils, a hook for getting that component's argumentsReview requests:
Testing, todo:
Closes EXEC-501