Skip to content

Conversation

@mjhuff
Copy link
Contributor

@mjhuff mjhuff commented Nov 10, 2025

Overview

Incremental mergeback of the current HEAD of chore_release-8.8.0 into edge. Resolves conflicts in the following files:

LivestreamViewer/index.tsx
ProtocolCard.tsx

koji and others added 11 commits November 7, 2025 10:31
…20077)

Ensures the configuration file that use to default to "NONE" now reinforces the new oe-core default.
…ug fix (#20076)

# Overview

Adding a bullet to release notes for #20072.

## Changelog

- One new bullet in 8.6.3 section.
- Remove some duplicate lines further down the notes file.

## Review requests

words good?

## Risk assessment

v low
# Overview
This PR updates the OT3 Controller's motion planning to adjust the
commanded speed for a multi axis move if one of the plunger's are in the
moving axis. this ensures that the pipettes' plunger will move at the
speed commanded.

Right now we only move the plunger and other axis during dynamic
pipetting so this won't affect anything else in the system.

After doing it's best to adjust this speed, if the move is still
impossible an error will be logged into the api logs.
… color on camera settings (#20061)

# Overview

Removed wrapping behavior of module icons in protocol card and robot
card
Corrected text on camera settings in run setup
Updated camera enabled text to a chip

## Test Plan and Hands on Testing

Smoke tested: 
<img width="931" height="332" alt="Screenshot 2025-11-06 at 12 35 10 PM"
src="https://github.com/user-attachments/assets/696b8acd-a14f-4b32-95c6-7643240d3ee5"
/>
<img width="931" height="149" alt="Screenshot 2025-11-06 at 4 11 08 PM"
src="https://github.com/user-attachments/assets/b37ebf6b-7a86-4b6b-95f8-98950bbbe47e"
/>


<img width="900" height="547" alt="Screenshot 2025-11-06 at 3 15 43 PM"
src="https://github.com/user-attachments/assets/d8198898-5852-4930-9830-85385138b68c"
/>

<img width="913" height="564" alt="Screenshot 2025-11-06 at 3 21 59 PM"
src="https://github.com/user-attachments/assets/7a5e8bcd-6cab-417a-9724-ac342613d165"
/>
<img width="991" height="617" alt="Screenshot 2025-11-06 at 4 19 05 PM"
src="https://github.com/user-attachments/assets/d4c4266a-45b0-4c3d-874b-5078a79c564c"
/>



## Risk assessment
low

Closes RQA-4819
Closes RQA-4825
Closes RQA-4824
Closes RQA-4830
Closes RQA-4823
Closes RQA-4835
Currently, we inject the `runId` into the secondary window, and that
`runId` serves as the basis for determining whether or not we should
render the stream. However, if a user keeps the secondary window open
when creating a new run on the same robot, the stream still reflects the
old run.

To fix, we check if this robot has a current run, and use that as the
basis for rendering the livestream. All of this works as expected
largely because we block the "show livestream" button for historical
runs.
…20082)

# Overview

Changes the `check_preferences` text to yellow if the image storage is
almost full, red if the camera is disabled but needed for the run, grey
if the camera settings are is ready to be confirmed, and green if the
camera settings have been confirmed.

## Test Plan and Hands on Testing

- smoke tested on robot


https://github.com/user-attachments/assets/144dce45-58f7-4da8-b9d0-c7a819ca2176

## Changelog

- an additional param was added to check the storage info
- camera set up is now being viewed as a module set up type to allow for
checking of camera enablement and storage

## Review requests

- What do you need from reviewers to feel confident this PR is ready to
merge?
- Ask questions.

## Risk assessment
- lowish
- may have accidentally changed other text formatting

Closes
RQA-4828
Resolved conflicts:
- protocol-designer/release-notes.md
We render "robot is busy" banners on the robot details and robot settings views, however, the conditions in which we disable certain actions (ex., uploading zip files to a robot or allowing recalibration) are inconsistent from the conditions in which we render the banner.

Currently, we disable or enable certain actions based on a variety of factors:

* Whether the robot is "busy", which is roughly defined as whether there is a maintenance run or protocol run in progress, or there is an active subsystem update.
* Whether a protocol run exists.
* Whether a user has clicked specific module CTAs. The implementation of this one currently lacks a way to disable the "robot is busy" state, so once those specific items were clicked, the robot was busy so long as a user was on the robot settings page.

Another downstream consequence of this logic is that we permit desktop users to launch a maintenance run flow while another maintenance run is active.

The solution in this commit is the following:

* No actions of any kind should be permitted if the robot is busy (see the first bullet, above). This is the most conservative approach, but it is by far the least surprising to end-users. There's no more confusion why certain settings are disabled without the banner rendering and vice versa. For example, we could in theory update camera settings while a run is in progress, but under this proposal, a user wouldn't be permitted to do so. The additional (and more important benefit I think), is the code is significantly more auditable - we invoke the useIsRobotBusy hook exactly once at the top level component responsible for rendering all the settings, and that's it.
* We only block updating by zip file if there is a current, non-terminal run.

NOTE: The one spot that is quite annoying is still the whole "run uncurrenting" logic, which will cause the banner to persist when an end-user may think it shouldn't. This isn't a regression introduced by this commit, but yeah, if a user over-eagerly navigates away from a run and the ODD can't implicitly close the run context, then the banner persists...but that's a different problem for a different day I think.
@mjhuff mjhuff requested review from a team and ddcc4 November 10, 2025 17:27
@mjhuff mjhuff changed the title 8.8.0 into edge incremental mergeback chore(mono): merge HEAD of chore_release-8.8.0 into edge Nov 10, 2025
@codecov
Copy link

codecov bot commented Nov 10, 2025

Codecov Report

❌ Patch coverage is 4.20712% with 296 lines in your changes missing coverage. Please review.
✅ Project coverage is 26.10%. Comparing base (23abc50) to head (f6e1228).
⚠️ Report is 16 commits behind head on edge.

Files with missing lines Patch % Lines
...streamViewer/hooks/useReportWindowDurationEvent.ts 0.00% 56 Missing ⚠️
...rganisms/Desktop/ProtocolsLanding/ProtocolCard.tsx 0.00% 37 Missing ⚠️
.../src/pages/Desktop/Devices/RobotSettings/index.tsx 0.00% 35 Missing ⚠️
...s/Desktop/Devices/ProtocolRun/ProtocolRunSetup.tsx 0.00% 28 Missing ⚠️
app/src/pages/Desktop/LivestreamViewer/index.tsx 0.00% 20 Missing ⚠️
...ages/Desktop/LivestreamViewer/hooks/useHlsVideo.ts 0.00% 15 Missing ⚠️
...ux-resources/analytics/hooks/useCameraAnalytics.ts 0.00% 10 Missing ⚠️
...rganisms/Desktop/Devices/InstrumentsAndModules.tsx 0.00% 8 Missing ⚠️
...ganisms/Desktop/RobotSettingsCalibration/index.tsx 0.00% 8 Missing ⚠️
app/src/redux/analytics/constants.ts 0.00% 7 Missing ⚠️
... and 26 more
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #20097      +/-   ##
==========================================
+ Coverage   25.09%   26.10%   +1.01%     
==========================================
  Files        3558     3559       +1     
  Lines      297575   299024    +1449     
  Branches    42158    42900     +742     
==========================================
+ Hits        74682    78072    +3390     
+ Misses     222870   220928    -1942     
- Partials       23       24       +1     
Flag Coverage Δ
protocol-designer 19.18% <4.20%> (-0.01%) ⬇️
step-generation 5.46% <0.00%> (-0.01%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines Coverage Δ
app-shell/src/secondary-windows/index.ts 0.00% <ø> (ø)
...tocolRun/ProtocolRunCamera/LaunchLivestreamBtn.tsx 0.00% <ø> (ø)
app/src/redux/shell/types.ts 100.00% <ø> (ø)
...e/hardware_control/motion_planning/move_manager.py 89.58% <ø> (-0.22%) ⬇️
...ponents/organisms/StepSummary/getLiquidDisplay.tsx 96.42% <100.00%> (+0.42%) ⬆️
app/src/redux/shell/actions.ts 28.85% <0.00%> (+28.19%) ⬆️
app/src/resources/runs/useCurrentRun.ts 0.00% <0.00%> (ø)
...ganisms/Desktop/Devices/Peripherals/CameraCard.tsx 0.00% <0.00%> (ø)
...rc/organisms/Desktop/Devices/PipetteCard/index.tsx 0.00% <0.00%> (ø)
.../Desktop/Devices/ProtocolRun/SetupCamera/index.tsx 0.00% <0.00%> (ø)
... and 31 more

... and 148 files with indirect coverage changes

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

Copy link
Collaborator

@ddcc4 ddcc4 left a comment

Choose a reason for hiding this comment

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

Thanks!

rclarke0 and others added 3 commits November 10, 2025 13:04
…onsistencies (#20093)

# Overview

Added missing labware images and fixed brand casing inconsistencies

## Test Plan and Hands on Testing

Smoke tested on labware-library
<img width="422" height="349" alt="Screenshot 2025-11-10 at 11 00 42 AM"
src="https://github.com/user-attachments/assets/10221ea4-8f57-4b76-9c6f-e265f1ee603c"
/>
<img width="424" height="351" alt="Screenshot 2025-11-10 at 11 00 56 AM"
src="https://github.com/user-attachments/assets/accb27e7-9879-4509-addd-0a259e8593a4"
/>
<img width="428" height="353" alt="Screenshot 2025-11-10 at 11 01 07 AM"
src="https://github.com/user-attachments/assets/85e50709-a7bb-48da-9f0c-94d702144494"
/>
<img width="429" height="349" alt="Screenshot 2025-11-10 at 11 02 40 AM"
src="https://github.com/user-attachments/assets/a6dd5ac9-e9a1-4611-8bb1-5f7f8ed1726c"
/>


## Risk assessment

low

Finishes AUTH-1941 & EXEC-1770
Other labware do not have tickets associated.
@mjhuff mjhuff force-pushed the 8.8.0-into-edge-incremental-mergeback branch from 73d4df8 to f6e1228 Compare November 10, 2025 18:36
@mjhuff mjhuff requested review from a team as code owners November 10, 2025 18:36
@mjhuff mjhuff requested review from ncdiehl11 and removed request for a team and ncdiehl11 November 10, 2025 18:36
@mjhuff mjhuff merged commit 001d2ba into edge Nov 10, 2025
122 of 123 checks passed
@mjhuff mjhuff deleted the 8.8.0-into-edge-incremental-mergeback branch November 10, 2025 19:58
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.

8 participants