Skip to content
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): resolve module location conflicts through deck config during protocol setup on ODD #14966

Merged
merged 15 commits into from
Apr 23, 2024

Conversation

b-cooper
Copy link
Contributor

@b-cooper b-cooper commented Apr 19, 2024

Overview

Resolve location conflicts in the on device display's protocol setup flow by updating deck
configuration accordingly.

Closes PLAT-287, PLAT-291

Review requests

  • resolve location conflicts during the deck hardware setup step of protocol run setup on the ODD

Risk assessment

low

b-cooper added 13 commits April 17, 2024 15:35
… 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
@b-cooper b-cooper marked this pull request as ready for review April 22, 2024 21:14
@b-cooper b-cooper requested review from a team as code owners April 22, 2024 21:14
@b-cooper b-cooper requested review from ncdiehl11, brenthagen, CaseyBatten and mjhuff and removed request for a team and ncdiehl11 April 22, 2024 21:14
Copy link
Contributor

@mjhuff mjhuff left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the global useNotifyService mock!

I think fixing the failing test is hopefully 🤞 as simple as a vi.unmock in useNotifyService.test.ts

Copy link
Contributor

@brenthagen brenthagen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

some ui nits, but the substantive conflict changes look good to me !

Screen Shot 2024-04-23 at 1 52 44 PM Screen Shot 2024-04-23 at 1 53 29 PM

const attachedModules = useModulesQuery().data?.data ?? []
const history = useHistory()
const currentRunId = useCurrentRunId()
const { stopRun } = useStopRunMutation()
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be useDismissCurrentRunMutation? stop run doesn't navigate away from the run setup/modal

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh good call, we may actually have to do both. I'll look into dismissing an un-started idle run.

@b-cooper b-cooper merged commit 5415917 into edge Apr 23, 2024
34 checks passed
@b-cooper b-cooper deleted the app_resolve-module-fixture-conflict-on-odd branch April 23, 2024 21:32
Carlos-fernandez pushed a commit that referenced this pull request May 20, 2024
…g protocol setup on ODD (#14966)

Resolve location conflicts in the on device display's protocol setup flow by updating deck configuration accordingly.

Closes PLAT-287,
Closes PLAT-291
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants