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

chore: mergeback for 7.0.0 #13675

Merged
merged 29 commits into from
Sep 28, 2023
Merged

chore: mergeback for 7.0.0 #13675

merged 29 commits into from
Sep 28, 2023

Conversation

sfoster1
Copy link
Member

No description provided.

jerader and others added 29 commits September 19, 2023 17:20
#13567)

* updated TCV2 labwareOffset and its flex transform
* added stackingOverlap with TCV2 for imp TC-related labware
* update calibration block well z, update api tests
All the flex multi pipettes have different tip overlaps than we thought,
so update them and also add entries for filter tipracks since they would
otherwise use the default of 10.5mm which is definitely wrong.
fixes a reversion introduced by the Flex icon priority changes. since an OT-2 usb connection is
actually an ethernet connection inside the frame of the OT-2, we need to only render the ethernet
icon for the Flex.

closes RQA-1556
…on sessions (#13607)

* Move test_sesion.tavern.yaml to sessions/.

* Add an integration test.

* Do not require a "default" key within gripperOffsets.

* Flesh out `get_labware_gripper_offsets()` docstring.

* Fix state leakage between /sessions integration tests.
…3606)

OT3 tiprack naming convention transitioned to "opentrons_flex_96_tiprack..." standard.
…ror message (#13609)

* Map internal strings to user-facing strings.

* Resolve todo in integration test.
…#13613)

add open door status check to display open door alert modal for odd and fix protocol run header
banner rendering bugin desktop app

fix RQA-1604
* fix(app): display alerts for pipette offset discrepencies

fix RAUT-737
* feat(app): fix small ui bugs on ODD
* fix(app): fix tc module calibration issue
* fix(app): fix open door alert modal display condition
…13622)

this is a fallback to avoid a stuck disconnect modal loading state if the browser is unable to
respond to a successful disconnect wifi request

closes RQA-1495
* feat(app): oDD banners for pipette calibration warning

fix RAUT-737

* Update app/src/organisms/Devices/InstrumentsAndModules.tsx

Co-authored-by: koji <[email protected]>

* format

---------

Co-authored-by: Seth Foster <[email protected]>
Co-authored-by: koji <[email protected]>
The issue was that the implementation couldn't handle OT-2 case since the initial renderModuleStatus
was the button. Update the initial renderModuleStatus and update the conditions.

close RQA-1549
* fix(app): update software update modal text style
* fix(app): enable doorSafetySwitch for OT-2
When detaching a gripper instrument, the left hand text prompts the user to remove the bottom screw
twice without referencing the top screw. This PR changes the first reference of unscrewing the
bottom screw to the top screw.
* fix(app): update conditional calibration required banner rendering

Clearing pipette/gripper calibration now sets the calibrated offsets to zero instead of clearing the
calibrated offsets property. Checking the date last calibrated property is the easiest and most
accurate way to determine if a calibration is necessary.

* fix(app): hide OT-2 calibration banner when robot is not viewable
* fix(app): fix odd module screen update issue
)

* fix(app): fix desktop door status check condition for run button
@sfoster1 sfoster1 requested a review from a team as a code owner September 27, 2023 21:20
@sfoster1 sfoster1 requested review from a team as code owners September 27, 2023 21:20
@sfoster1 sfoster1 requested review from shlokamin and removed request for a team September 27, 2023 21:20
@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

Merging #13675 (b8dd3f3) into edge (698b5fb) will decrease coverage by 0.24%.
Report is 90 commits behind head on edge.
The diff coverage is 62.16%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #13675      +/-   ##
==========================================
- Coverage   71.23%   71.00%   -0.24%     
==========================================
  Files        2424     2437      +13     
  Lines       68830    70464    +1634     
  Branches     8183     8701     +518     
==========================================
+ Hits        49034    50034    +1000     
- Misses      17917    18473     +556     
- Partials     1879     1957      +78     
Flag Coverage Δ
app 69.13% <62.16%> (+0.15%) ⬆️
components 60.83% <ø> (ø)
g-code-testing 96.44% <ø> (ø)
hardware 56.45% <ø> (+0.05%) ⬆️
hardware-testing ∅ <ø> (∅)
labware-library 49.17% <ø> (ø)
notify-server 89.13% <ø> (ø)
protocol-designer 46.97% <ø> (+0.25%) ⬆️
react-api-client 69.47% <ø> (ø)
shared-data 74.28% <ø> (+<0.01%) ⬆️
step-generation 87.59% <ø> (+1.20%) ⬆️
system-server 96.02% <ø> (ø)
update-server 63.70% <ø> (ø)
usb-bridge 76.81% <ø> (ø)

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

Files Coverage Δ
api/src/opentrons/config/reset.py 88.88% <ø> (ø)
api/src/opentrons/protocol_engine/state/labware.py 100.00% <ø> (ø)
app/src/atoms/Toast/index.tsx 79.09% <ø> (ø)
...rganisms/Devices/ProtocolRun/ProtocolRunHeader.tsx 90.11% <100.00%> (+0.61%) ⬆️
...ices/ProtocolRun/SetupModules/SetupModulesList.tsx 83.33% <100.00%> (+0.28%) ⬆️
app/src/organisms/Devices/RobotOverview.tsx 65.00% <100.00%> (+5.00%) ⬆️
...s/RobotSettings/ConnectNetwork/DisconnectModal.tsx 85.71% <100.00%> (+0.71%) ⬆️
app/src/organisms/Devices/RobotStatusHeader.tsx 86.04% <100.00%> (+0.33%) ⬆️
app/src/organisms/Devices/getModulePrepCommands.ts 90.00% <ø> (ø)
.../src/organisms/Devices/hooks/useAttachedModules.ts 66.66% <100.00%> (+16.66%) ⬆️
... and 27 more

... and 66 files with indirect coverage changes

Copy link
Contributor

@smb2268 smb2268 left a comment

Choose a reason for hiding this comment

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

looks good to me!

@@ -19,6 +26,7 @@ const DEFAULT_RELEASE_NOTES = 'We recommend upgrading to the latest version.'
export function ReleaseNotes(props: ReleaseNotesProps): JSX.Element {
const { source } = props

console.log(DEFAULT_RELEASE_NOTES)
Copy link
Contributor

Choose a reason for hiding this comment

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

this should be removed

@sfoster1 sfoster1 merged commit b21a501 into edge Sep 28, 2023
295 of 328 checks passed
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.