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: release->edge for 8.0.0 #16389

Merged
merged 39 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
8713caa
fix(app): fix labware location on labware details modal (ODD protocol…
ncdiehl11 Sep 5, 2024
2878ab3
fix(app): fix "rerun protocol now" redirection delay (#16199)
mjhuff Sep 5, 2024
6948d93
fix(app): fix browser layer notification error handling (#16207)
mjhuff Sep 6, 2024
02ba906
feat(app): add mixpanel tracking for quick transfer (#16200)
smb2268 Sep 6, 2024
b462aaf
fix(app): Don't initialize the keyboard with an invalid value when cr…
vegano1 Sep 6, 2024
a1bab54
fix(app): scrolling issue in deck hardware screen (#16202)
koji Sep 7, 2024
904b1ef
fix(app): liquid state needs analysis (#16212)
sfoster1 Sep 9, 2024
877d5a5
fix(app): fix undismissable calibration modals after e-stop event (#1…
mjhuff Sep 9, 2024
eeb0eeb
fix(app): Fix scrolling behind long press modals (#16206)
smb2268 Sep 9, 2024
adde5a7
refactor(app): remove quick transfer file logging for final alpha (#1…
smb2268 Sep 9, 2024
7002fac
fix(app): initialize disposal volume field with correct value (#16219)
smb2268 Sep 9, 2024
b0b8221
fix(robot-server): matching RTPs check during analysis of non-RTP pro…
sanni-t Sep 9, 2024
9916a7c
fix(app): fix gray run status when pressing "return to dash" on `RunS…
mjhuff Sep 10, 2024
176e494
fix(app): display only one conflict with thermocycler in run setup (#…
brenthagen Sep 10, 2024
ff6a36f
fix(api): Maintain existing nozzle manager for reloaded virtual pipet…
CaseyBatten Sep 10, 2024
9d9c360
fix(app): scroll to top of screen whenever route is changed (#16230)
smb2268 Sep 10, 2024
8940797
fix(app): display correct pipette configuration names in run preview …
CaseyBatten Sep 10, 2024
9c83c6d
chore(cherrypick): 16208 to chore_release-8.0.0 (#16232)
y3rsh Sep 10, 2024
455d026
fix(app): disable save button once clicked on name transfer screen (#…
smb2268 Sep 11, 2024
79cfedf
fix(app): Fix entering error recovery while door is open (#16245)
mjhuff Sep 12, 2024
318b93e
fix(api): don't do lld when there is volume in the tip already (#16244)
ryanthecoder Sep 12, 2024
cf27f54
fix(api): default to both sensors on lld (#16247)
ryanthecoder Sep 12, 2024
dff6347
fix(app): fix auto transitioning run from recovery-paused to waiting …
mjhuff Sep 16, 2024
5f868c7
fix(api, shared-data): Disable tip presence on single tip pickup with…
CaseyBatten Sep 16, 2024
81770b3
fix(app): fix ODD drop tip modal overflow not dismissing (#16263)
mjhuff Sep 17, 2024
5d86811
test(app): add tests for individual advanced setting files (#16265)
smb2268 Sep 17, 2024
f77a962
fix(api): use critical point instead of primary nozzle when doing dec…
sanni-t Sep 17, 2024
7ff4b9f
test(app): new test for main advanced setting quick transfer screen (…
smb2268 Sep 18, 2024
3a8bfc8
fix(app): fix protocol summary text wrapping issue on ODD (#16281)
koji Sep 18, 2024
a7dea54
chore: 8.0.0 known issues at time of code freeze (#16192)
ecormany Sep 18, 2024
6293e07
fix(app): disable run again button when old run is being dismissed (#…
shlokamin Sep 19, 2024
65b0d7f
fix(api): Fix liquidProbe error message after blowout (#16294)
SyntaxColoring Sep 19, 2024
59be09e
fix(app): fix stale error data displaying (#16305)
mjhuff Sep 19, 2024
fd9ffe1
fix(app): fix MoveInterventionModal labware begin location not updati…
mjhuff Sep 19, 2024
5e1dabf
fix(app): dont update estimators on ot2 (#16315)
sfoster1 Sep 20, 2024
1e268d3
fix(api): Disable tip presence check on 8ch single and partial 2 thru…
CaseyBatten Sep 20, 2024
a6b3308
docs(api): partial pickup static workaround (#16290)
ecormany Sep 20, 2024
5658b8a
fix(hardware): Fix the pressure sensor log from growing infinitely (#…
ryanthecoder Sep 24, 2024
fc5dd9b
Merge branch 'edge' into release-mergeback-for-8.0.0
sfoster1 Oct 1, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/src/organisms/ErrorRecoveryFlows/RecoverySplash.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import {
POSITION_ABSOLUTE,
PrimaryButton,
SecondaryButton,
LargeButton,
SPACING,
StyledText,
TEXT_ALIGN_CENTER,
TYPOGRAPHY,
LargeButton,
WARNING_TOAST,
} from '@opentrons/components'
import {
Expand Down Expand Up @@ -66,10 +66,10 @@ type RecoverySplashProps = ErrorRecoveryFlowsProps &
failedCommand: ReturnType<typeof useRetainedFailedCommandBySource>
robotType: RobotType
robotName: string
toggleERWizAsActiveUser: UseRecoveryTakeoverResult['toggleERWizAsActiveUser']
analytics: UseRecoveryAnalyticsResult<RecoveryRoute, RouteStep>
/* Whether the app should resume any paused recovery state without user action. */
resumePausedRecovery: boolean
toggleERWizAsActiveUser: UseRecoveryTakeoverResult['toggleERWizAsActiveUser']
analytics: UseRecoveryAnalyticsResult<RecoveryRoute, RouteStep>
}
export function RecoverySplash(props: RecoverySplashProps): JSX.Element | null {
const {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
POSITION_FIXED,
SPACING,
} from '@opentrons/components'

import { ANALYTICS_QUICK_TRANSFER_SETTING_SAVED } from '/app/redux/analytics'
import { getTopPortalEl } from '/app/App/portal'
import { ChildNavigation } from '/app/organisms/ODD/ChildNavigation'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ vi.mock('@opentrons/shared-data', async importOriginal => {
getPipetteModelSpecs: vi.fn(),
}
})

vi.mock('/app/resources/maintenance_runs')
vi.mock('/app/organisms/PipetteWizardFlows')
vi.mock('/app/organisms/GripperWizardFlows')
Expand Down
59 changes: 32 additions & 27 deletions app/src/pages/ODD/QuickTransferDashboard/LongPressModal.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useState } from 'react'
import { useDispatch, useSelector } from 'react-redux'
import { useNavigate } from 'react-router-dom'
import { createPortal } from 'react-dom'
import { useTranslation } from 'react-i18next'
import {
Flex,
Expand All @@ -13,6 +14,7 @@ import {
import { useCreateRunMutation } from '@opentrons/react-api-client'

import { MAXIMUM_PINNED_PROTOCOLS } from '/app/App/constants'
import { getTopPortalEl } from '/app/App/portal'
import { SmallModalChildren } from '/app/molecules/OddModal'
import { useToaster } from '/app/organisms/ToasterOven'
import { getPinnedQuickTransferIds, updateConfigValue } from '/app/redux/config'
Expand Down Expand Up @@ -94,7 +96,7 @@ export function LongPressModal({
)
longpress.setIsLongPressed(false)
}

// TODO(sf 10-01-24): Create an ODD-specific component that wraps MenuList with a portal.
return (
<>
{showMaxPinsAlert ? (
Expand All @@ -107,32 +109,35 @@ export function LongPressModal({
}}
/>
) : (
<MenuList onClick={handleCloseModal} isOnDevice={true}>
<MenuItem onClick={handleRunClick} key="play-circle">
<Flex>
<Icon name="play-circle" size="1.75rem" />
<LegacyStyledText marginLeft={SPACING.spacing24}>
{t('run_transfer')}
</LegacyStyledText>
</Flex>
</MenuItem>
<MenuItem onClick={handlePinClick} key="pin">
<Flex>
<Icon name="pin" size="2.5rem" />
<LegacyStyledText marginLeft={SPACING.spacing24}>
{pinned ? t('unpin_transfer') : t('pin_transfer')}
</LegacyStyledText>
</Flex>
</MenuItem>
<MenuItem onClick={handleDeleteClick} key="trash" isAlert={true}>
<Flex>
<Icon name="trash" size="2.5rem" />
<LegacyStyledText marginLeft={SPACING.spacing24}>
{t('delete_transfer')}
</LegacyStyledText>
</Flex>
</MenuItem>
</MenuList>
createPortal(
<MenuList onClick={handleCloseModal} isOnDevice={true}>
<MenuItem onClick={handleRunClick} key="play-circle">
<Flex>
<Icon name="play-circle" size="1.75rem" />
<LegacyStyledText marginLeft={SPACING.spacing24}>
{t('run_transfer')}
</LegacyStyledText>
</Flex>
</MenuItem>
<MenuItem onClick={handlePinClick} key="pin">
<Flex>
<Icon name="pin" size="2.5rem" />
<LegacyStyledText marginLeft={SPACING.spacing24}>
{pinned ? t('unpin_transfer') : t('pin_transfer')}
</LegacyStyledText>
</Flex>
</MenuItem>
<MenuItem onClick={handleDeleteClick} key="trash" isAlert={true}>
<Flex>
<Icon name="trash" size="2.5rem" />
<LegacyStyledText marginLeft={SPACING.spacing24}>
{t('delete_transfer')}
</LegacyStyledText>
</Flex>
</MenuItem>
</MenuList>,
getTopPortalEl()
)
)}
</>
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { useSelector } from 'react-redux'
import { useTrackEvent } from '../../../redux/analytics'
import { getLocalRobot, getRobotSerialNumber } from '../../../redux/discovery'
import { useTrackEvent } from '/app/redux/analytics'
import { getLocalRobot, getRobotSerialNumber } from '/app/redux/discovery'

interface AnalyticsEvent {
name: string
Expand Down
Loading