+
+
+
+ )
+}
diff --git a/app/src/molecules/SlotDetailsEmptyState/slotdetailsemptystate.module.css b/app/src/molecules/SlotDetailsEmptyState/slotdetailsemptystate.module.css
new file mode 100644
index 00000000000..b4b0838ebf7
--- /dev/null
+++ b/app/src/molecules/SlotDetailsEmptyState/slotdetailsemptystate.module.css
@@ -0,0 +1,24 @@
+.slot_empty_container {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ flex-direction: column;
+ gap: var(--spacing-16);
+}
+
+.slot_empty_header {
+ display: flex;
+ width: 100%;
+ justify-content: flex-start;
+}
+
+.slot_empty_body {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+ justify-content: center;
+ padding: var(--spacing-16) var(--spacing-24);
+ border-radius: var(--border-radius-4);
+ background-color: var(--grey-10);
+}
diff --git a/app/src/organisms/Desktop/Camera/CameraControls/ZoomSettings.tsx b/app/src/organisms/Desktop/Camera/CameraControls/ZoomSettings.tsx
index ed37a026fdd..bf2bf61ad2a 100644
--- a/app/src/organisms/Desktop/Camera/CameraControls/ZoomSettings.tsx
+++ b/app/src/organisms/Desktop/Camera/CameraControls/ZoomSettings.tsx
@@ -3,14 +3,15 @@ import { useTranslation } from 'react-i18next'
import { StyledText } from '@opentrons/components'
import { TouchControlButton } from '/app/atoms/buttons/TouchControlButton'
+import { zoomNumberToString } from '/app/local-resources/images/utils/cameraUtils'
import styles from './cameracontrols.module.css'
-import type { UseStubCameraSettingsValuesResult } from './hooks/useStubCameraSettingsValues'
+import type { UseCameraSettingsValuesResult } from '/app/local-resources/images/hooks/useCameraSettingsValues'
export interface ZoomSettingsProps {
- zoom: UseStubCameraSettingsValuesResult['zoom']
- adjustZoom: UseStubCameraSettingsValuesResult['adjustZoom']
+ zoom: UseCameraSettingsValuesResult['zoom']
+ adjustZoom: UseCameraSettingsValuesResult['adjustZoom']
}
export function ZoomSettings({
@@ -28,22 +29,22 @@ export function ZoomSettings({
+
+
+
+ {t('slot_empty')}
+
+
+
-
)
}
interface ZoomBtnProps {
- currentZoom: UseStubCameraSettingsValuesResult['zoom']
- btnZoomValue: UseStubCameraSettingsValuesResult['zoom']
- adjustZoom: UseStubCameraSettingsValuesResult['adjustZoom']
+ currentZoom: UseCameraSettingsValuesResult['zoom']
+ btnZoomValue: UseCameraSettingsValuesResult['zoom']
+ adjustZoom: UseCameraSettingsValuesResult['adjustZoom']
}
function ZoomBtn({
@@ -52,13 +53,14 @@ function ZoomBtn({
adjustZoom,
}: ZoomBtnProps): JSX.Element {
const { t } = useTranslation('device_settings')
+ const btnZoomValueString = zoomNumberToString(btnZoomValue)
const onClick = (): void => {
- adjustZoom(btnZoomValue)
+ adjustZoom(btnZoomValueString)
}
const isActive = currentZoom === btnZoomValue
const buildBtnCopy = (): string => {
- switch (btnZoomValue) {
+ switch (btnZoomValueString) {
case '1x':
return t('default')
case '1.5x':
@@ -71,7 +73,7 @@ function ZoomBtn({
return (
+ {t('Cancel')}
+
+
+
+ {isLoading &&
+
@@ -140,7 +142,10 @@ export function CameraCard({
)}
{showControls &&
createPortal(
-
diff --git a/app/src/organisms/Desktop/Devices/PipetteCard/FlexPipetteCard.tsx b/app/src/organisms/Desktop/Devices/PipetteCard/FlexPipetteCard.tsx
index 8dadbdb79f5..9d61a621e09 100644
--- a/app/src/organisms/Desktop/Devices/PipetteCard/FlexPipetteCard.tsx
+++ b/app/src/organisms/Desktop/Devices/PipetteCard/FlexPipetteCard.tsx
@@ -37,7 +37,7 @@ interface FlexPipetteCardProps {
attachedPipette: PipetteData | BadPipette | null
pipetteModelSpecs: PipetteModelSpecs | null
mount: Mount
- isRobotBusy: boolean
+ isRunActive: boolean
isEstopNotDisengaged: boolean
}
@@ -57,7 +57,7 @@ export function FlexPipetteCard({
pipetteModelSpecs,
attachedPipette,
mount,
- isRobotBusy,
+ isRunActive,
isEstopNotDisengaged,
}: FlexPipetteCardProps): JSX.Element {
const { t, i18n } = useTranslation(['device_details', 'shared'])
@@ -139,7 +139,7 @@ export function FlexPipetteCard({
? [
{
label: t('attach_pipette'),
- disabled: attachedPipette != null || isRobotBusy,
+ disabled: attachedPipette != null || isRunActive,
onClick: handleChoosePipette,
},
]
@@ -149,12 +149,12 @@ export function FlexPipetteCard({
attachedPipette.data.calibratedOffset?.last_modified != null
? t('recalibrate_pipette')
: t('calibrate_pipette'),
- disabled: attachedPipette == null || isRobotBusy,
+ disabled: attachedPipette == null || isRunActive,
onClick: handleCalibrate,
},
{
label: t('detach_pipette'),
- disabled: attachedPipette == null || isRobotBusy,
+ disabled: attachedPipette == null || isRunActive,
onClick: handleDetach,
},
{
@@ -166,7 +166,7 @@ export function FlexPipetteCard({
},
{
label: i18n.format(t('drop_tips'), 'capitalize'),
- disabled: attachedPipette == null || isRobotBusy,
+ disabled: attachedPipette == null || isRunActive,
onClick: () => {
enableDTWiz()
},
diff --git a/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/FlexPipetteCard.test.tsx b/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/FlexPipetteCard.test.tsx
index 4900ffec11e..143527283c4 100644
--- a/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/FlexPipetteCard.test.tsx
+++ b/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/FlexPipetteCard.test.tsx
@@ -58,7 +58,7 @@ describe('FlexPipetteCard', () => {
},
} as PipetteData,
mount: 'left',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
vi.mocked(useCurrentSubsystemUpdateQuery).mockReturnValue({
@@ -110,7 +110,7 @@ describe('FlexPipetteCard', () => {
},
} as PipetteData,
mount: 'left',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -136,7 +136,7 @@ describe('FlexPipetteCard', () => {
},
} as PipetteData,
mount: 'left',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
@@ -164,7 +164,7 @@ describe('FlexPipetteCard', () => {
},
} as PipetteData,
mount: 'left',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: true,
}
@@ -187,7 +187,7 @@ describe('FlexPipetteCard', () => {
mount: 'left',
attachedPipette: null,
pipetteModelSpecs: null,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -236,7 +236,7 @@ describe('FlexPipetteCard', () => {
} as any,
mount: 'left',
pipetteModelSpecs: null,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -256,7 +256,7 @@ describe('FlexPipetteCard', () => {
} as any,
mount: 'left',
pipetteModelSpecs: null,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
diff --git a/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/PipetteCard.test.tsx b/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
index 6d8f281528f..ebfaabbf2cc 100644
--- a/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
+++ b/app/src/organisms/Desktop/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
@@ -45,7 +45,7 @@ describe('PipetteCard', () => {
mount: LEFT,
robotName: mockRobotName,
pipetteId: 'id',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
vi.mocked(PipetteOverflowMenu).mockReturnValue(
@@ -72,7 +72,7 @@ describe('PipetteCard', () => {
mount: LEFT,
robotName: mockRobotName,
pipetteId: 'id',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -86,7 +86,7 @@ describe('PipetteCard', () => {
mount: RIGHT,
robotName: mockRobotName,
pipetteId: 'id',
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -98,7 +98,7 @@ describe('PipetteCard', () => {
pipetteModelSpecs: null,
mount: RIGHT,
robotName: mockRobotName,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -110,7 +110,7 @@ describe('PipetteCard', () => {
pipetteModelSpecs: null,
mount: LEFT,
robotName: mockRobotName,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -122,7 +122,7 @@ describe('PipetteCard', () => {
pipetteModelSpecs: mockLeftSpecs,
mount: LEFT,
robotName: mockRobotName,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
@@ -133,7 +133,7 @@ describe('PipetteCard', () => {
pipetteModelSpecs: mockRightSpecs,
mount: RIGHT,
robotName: mockRobotName,
- isRobotBusy: false,
+ isRunActive: false,
isEstopNotDisengaged: false,
}
render(props)
diff --git a/app/src/organisms/Desktop/Devices/PipetteCard/index.tsx b/app/src/organisms/Desktop/Devices/PipetteCard/index.tsx
index 544fe97c70f..94e180c9e81 100644
--- a/app/src/organisms/Desktop/Devices/PipetteCard/index.tsx
+++ b/app/src/organisms/Desktop/Devices/PipetteCard/index.tsx
@@ -40,7 +40,7 @@ interface PipetteCardProps {
pipetteId?: AttachedPipette['id'] | null
mount: Mount
robotName: string
- isRobotBusy: boolean
+ isRunActive: boolean
isEstopNotDisengaged: boolean
}
@@ -54,7 +54,7 @@ export const PipetteCard = (props: PipetteCardProps): JSX.Element => {
mount,
robotName,
pipetteId,
- isRobotBusy,
+ isRunActive,
isEstopNotDisengaged,
} = props
const {
@@ -212,7 +212,7 @@ export const PipetteCard = (props: PipetteCardProps): JSX.Element => {
handleSettingsSlideout={handleSettingsSlideout}
handleAboutSlideout={handleAboutSlideout}
pipetteSettings={settings}
- isRunActive={isRobotBusy}
+ isRunActive={isRunActive}
/>
{menuOverlay}
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunCamera/index.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunCamera/index.tsx
index 7319b30e1eb..02c48f104c9 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunCamera/index.tsx
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunCamera/index.tsx
@@ -6,7 +6,7 @@ import { useHost } from '@opentrons/react-api-client'
import { OT2_ROBOT_TYPE } from '@opentrons/shared-data'
import { Divider } from '/app/atoms/structure'
-import { isTerminalRunStatus } from '/app/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/utils'
+import { isTerminalRunStatus } from '/app/local-resources/runs/utils'
import { OPENTRONS_USB } from '/app/redux/discovery'
import { getCameraUsageState } from '/app/redux/protocol-runs'
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderBannerContainer/getShowGenericRunHeaderBanners.ts b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderBannerContainer/getShowGenericRunHeaderBanners.ts
index 26c1ec97cb1..e39554ef634 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderBannerContainer/getShowGenericRunHeaderBanners.ts
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderBannerContainer/getShowGenericRunHeaderBanners.ts
@@ -1,11 +1,8 @@
-import {
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
- RUN_STATUS_BLOCKED_BY_OPEN_DOOR,
-} from '@opentrons/api-client'
+import { RUN_STATUS_BLOCKED_BY_OPEN_DOOR } from '@opentrons/api-client'
+
+import { isCancellableStatus } from '/app/local-resources/runs/utils'
import { NOT_CONFIGURED } from '../../../../../DoorOpenControl/useIsDoorOpen'
-import { isCancellableStatus } from '../utils'
import type { RunHeaderBannerContainerProps } from '.'
import type { DoorResult } from '../../../../../DoorOpenControl/useIsDoorOpen'
@@ -32,11 +29,7 @@ export function getShowGenericRunHeaderBanners({
enteredER,
}: ShowGenericRunHeaderBannersParams): ShowGenericRunHeaderBannersResult {
const beforeRunCondition =
- doorStatus.isDoorOpen &&
- isCancellableStatus(runStatus) &&
- runStatus !== RUN_STATUS_BLOCKED_BY_OPEN_DOOR &&
- runStatus !== RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR &&
- runStatus !== RUN_STATUS_AWAITING_RECOVERY_PAUSED
+ doorStatus.isDoorOpen && isCancellableStatus(runStatus)
const showDoorOpenBeforeRunBanner =
doorStatus.moduleDoorLocation === null && beforeRunCondition
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionBtnDisabledUtils.ts b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionBtnDisabledUtils.ts
index 0b737137d33..a33725776ce 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionBtnDisabledUtils.ts
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionBtnDisabledUtils.ts
@@ -2,19 +2,27 @@ import { useTranslation } from 'react-i18next'
import { RUN_STATUS_BLOCKED_BY_OPEN_DOOR } from '@opentrons/api-client'
-import { useIsDoorOpen } from '../../../hooks'
import {
isCancellableStatus,
isDisabledStatus,
isStartRunStatus,
-} from '../../../utils'
+} from '/app/local-resources/runs/utils'
+import {
+ useCurrentRunId,
+ useModuleCalibrationStatus,
+ useRunCalibrationStatus,
+ useUnmatchedModulesForProtocol,
+} from '/app/resources/runs'
+
+import { useIsDoorOpen } from '../../../hooks'
import { useIsFixtureMismatch } from './useIsFixtureMismatch'
import type { BaseActionButtonProps } from '..'
import type { DoorResult } from '../../../../../../../DoorOpenControl/useIsDoorOpen'
interface UseActionButtonDisabledUtilsProps extends BaseActionButtonProps {
- isCurrentRun: boolean
+ robotName: string
+ runId: string
isValidRunAgain: boolean
isSetupComplete: boolean
isOtherRunCurrent: boolean
@@ -34,7 +42,6 @@ export function useActionBtnDisabledUtils(
props: UseActionButtonDisabledUtilsProps
): UseActionButtonDisabledUtilsResult {
const {
- isCurrentRun,
isSetupComplete,
isOtherRunCurrent,
isProtocolNotReady,
@@ -45,6 +52,7 @@ export function useActionBtnDisabledUtils(
runId,
isResetRunLoadingRef,
isClosingCurrentRun,
+ isCameraReadyToRun,
} = props
const { isPlayRunActionLoading, isPauseRunActionLoading } =
@@ -52,9 +60,23 @@ export function useActionBtnDisabledUtils(
const doorStatus = useIsDoorOpen(robotName)
const isFixtureMismatch = useIsFixtureMismatch(runId, robotName)
const isResetRunLoading = isResetRunLoadingRef.current
+ const isCurrentRun = useCurrentRunId() === runId
+ const isCalibrationComplete = useRunCalibrationStatus(
+ robotName,
+ runId
+ ).complete
+ const isModuleCalibrationComplete = useModuleCalibrationStatus(
+ robotName,
+ runId
+ ).complete
+ const { missingModuleIds } = useUnmatchedModulesForProtocol(robotName, runId)
+ const isMissingModules = missingModuleIds.length > 0
const isDisabled =
(isCurrentRun && !isSetupComplete) ||
+ isMissingModules ||
+ isModuleCalibrationComplete ||
+ isCalibrationComplete ||
isPlayRunActionLoading ||
isPauseRunActionLoading ||
isResetRunLoading ||
@@ -63,16 +85,20 @@ export function useActionBtnDisabledUtils(
isProtocolNotReady ||
isFixtureMismatch ||
isDisabledStatus(runStatus) ||
+ !isCameraReadyToRun ||
isRobotOnWrongVersionOfSoftware ||
(doorStatus.isDoorOpen &&
runStatus !== RUN_STATUS_BLOCKED_BY_OPEN_DOOR &&
isCancellableStatus(runStatus))
const disabledReason = useDisabledReason({
- ...props,
- doorStatus,
isFixtureMismatch,
+ doorStatus,
isResetRunLoading,
+ isMissingModules,
+ isModuleCalibrationComplete,
+ isCalibrationComplete,
+ ...props,
})
return isDisabled
@@ -85,12 +111,14 @@ type UseDisabledReasonProps = UseActionButtonDisabledUtilsProps & {
isFixtureMismatch: boolean
isResetRunLoading: boolean
isClosingCurrentRun: boolean
+ isModuleCalibrationComplete: boolean
+ isMissingModules: boolean
+ isCalibrationComplete: boolean
+ isCameraReadyToRun: boolean
}
// The user-facing disabled explanation for why the ActionButton is disabled, if any.
function useDisabledReason({
- isCurrentRun,
- isSetupComplete,
isFixtureMismatch,
isValidRunAgain,
isOtherRunCurrent,
@@ -99,22 +127,30 @@ function useDisabledReason({
runStatus,
isResetRunLoading,
isClosingCurrentRun,
+ isMissingModules,
+ isModuleCalibrationComplete,
+ isCalibrationComplete,
isCameraReadyToRun,
}: UseDisabledReasonProps): string | null {
const { t } = useTranslation(['run_details', 'shared'])
-
- if (!isCameraReadyToRun) {
+ if (isRobotOnWrongVersionOfSoftware) {
+ return t('shared:a_software_update_is_available')
+ } else if (isClosingCurrentRun) {
+ return t('shared:robot_is_busy')
+ } else if (!isCameraReadyToRun) {
return t('enable_camera')
- } else if (
- isCurrentRun &&
- (!isSetupComplete || isFixtureMismatch) &&
- !isValidRunAgain
- ) {
- return t('setup_incomplete')
+ } else if (isFixtureMismatch) {
+ return t('fixture_mismatch')
+ } else if (!isValidRunAgain) {
+ return t('run_again_disabled')
} else if (isOtherRunCurrent && !isResetRunLoading) {
return t('shared:robot_is_busy')
- } else if (isRobotOnWrongVersionOfSoftware) {
- return t('shared:a_software_update_is_available')
+ } else if (!isCalibrationComplete) {
+ return t('instrument_calibration_incomplete')
+ } else if (isMissingModules) {
+ return t('modules_missing')
+ } else if (!isModuleCalibrationComplete) {
+ return t('module_calibration_incomplete')
} else if (
doorStatus.isDoorOpen &&
doorStatus.moduleDoorLocation !== null &&
@@ -123,8 +159,6 @@ function useDisabledReason({
return t('close_stacker_door')
} else if (doorStatus.isDoorOpen && isStartRunStatus(runStatus)) {
return t('close_door')
- } else if (isClosingCurrentRun) {
- return t('shared:robot_is_busy')
} else {
return null
}
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionButtonProperties.ts b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionButtonProperties.ts
index 7e86794a393..4337613c112 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionButtonProperties.ts
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/hooks/useActionButtonProperties.ts
@@ -1,15 +1,18 @@
import { useTranslation } from 'react-i18next'
import { useSelector } from 'react-redux'
-import {
- RUN_STATUS_IDLE,
- RUN_STATUS_RUNNING,
- RUN_STATUS_STOP_REQUESTED,
- RUN_STATUS_STOPPED,
-} from '@opentrons/api-client'
+import { RUN_STATUS_IDLE } from '@opentrons/api-client'
import { useAddCameraSettingsToRunMutation } from '@opentrons/react-api-client'
+import {
+ isModuleConfirmationStatus,
+ isRunAgainStatus,
+ isRunningOrRecoveryStatus,
+ isStartRunStatus,
+ isStopRequestedStatus,
+} from '/app/local-resources/runs/utils'
import { useIsHeaterShakerInProtocol } from '/app/organisms/ModuleCard/hooks'
+import { useToaster } from '/app/organisms/ToasterOven'
import { useTrackProtocolRunEvent } from '/app/redux-resources/analytics'
import {
SOURCE_RUN_RECORD,
@@ -27,11 +30,7 @@ import {
} from '/app/redux/protocol-runs'
import { isAnyHeaterShakerShaking } from '../../../RunHeaderModalContainer/modals'
-import {
- isRecoveryStatus,
- isRunAgainStatus,
- isStartRunStatus,
-} from '../../../utils'
+import { useActionBtnDisabledUtils } from './useActionBtnDisabledUtils'
import type { IconName } from '@opentrons/components'
import type { StepKey } from '/app/redux/protocol-runs'
@@ -48,8 +47,9 @@ interface UseButtonPropertiesProps extends BaseActionButtonProps {
isValidRunAgain: boolean
isOtherRunCurrent: boolean
isRobotOnWrongVersionOfSoftware: boolean
- isClosingCurrentRun: boolean
areCameraPreferencesConfirmed: boolean
+ isClosingCurrentRun: boolean
+ isCameraReadyToRun: boolean
}
// Returns ActionButton properties.
@@ -59,8 +59,12 @@ export function useActionButtonProperties({
robotName,
runId,
currentRunId,
+ isOtherRunCurrent,
+ isRobotOnWrongVersionOfSoftware,
confirmAttachment,
confirmMissingSteps,
+ makeHandleJumpToStep,
+ runRecord,
robotAnalyticsData,
robotSerialNumber,
protocolRunControls,
@@ -69,6 +73,9 @@ export function useActionButtonProperties({
isResetRunLoadingRef,
isClosingCurrentRun,
areCameraPreferencesConfirmed,
+ isValidRunAgain,
+ protocolRunHeaderRef,
+ isCameraReadyToRun,
}: UseButtonPropertiesProps): {
buttonText: string
handleButtonClick: () => void
@@ -92,10 +99,10 @@ export function useActionButtonProperties({
const runCameraSettings = useSelector((state: State) =>
getCameraUsageState(state, runId)
)
-
let buttonText = ''
let handleButtonClick = (): void => {}
let buttonIconName: IconName | null = null
+ console.log('🚀 ~ handlePlay ~ runStatus:', runStatus)
const handlePlay = (): void => {
play()
@@ -116,6 +123,27 @@ export function useActionButtonProperties({
recoveryCaptureEnabled: recoveryEnabled,
})
}
+ const isSetupComplete = !missingSetupSteps || missingSetupSteps.length === 0
+ const { makeSnackbar } = useToaster()
+ const { isDisabled, disabledReason } = useActionBtnDisabledUtils({
+ robotName,
+ runId,
+ isValidRunAgain,
+ isSetupComplete,
+ isOtherRunCurrent,
+ isProtocolNotReady,
+ isRobotOnWrongVersionOfSoftware,
+ isClosingCurrentRun,
+ makeHandleJumpToStep,
+ runRecord,
+ runStatus,
+ isResetRunLoadingRef,
+ protocolRunHeaderRef,
+ attachedModules,
+ protocolRunControls,
+ runHeaderModalContainerUtils,
+ isCameraReadyToRun,
+ })
if (isProtocolNotReady) {
buttonIconName = 'ot-spinner'
@@ -123,14 +151,14 @@ export function useActionButtonProperties({
} else if (isClosingCurrentRun) {
buttonIconName = 'ot-spinner'
buttonText = t('shared:robot_is_busy')
- } else if (runStatus === RUN_STATUS_RUNNING || isRecoveryStatus(runStatus)) {
+ } else if (isRunningOrRecoveryStatus(runStatus)) {
buttonIconName = 'pause'
buttonText = t('pause_run')
handleButtonClick = () => {
pause()
trackProtocolRunEvent({ name: ANALYTICS_PROTOCOL_RUN_ACTION.PAUSE })
}
- } else if (runStatus === RUN_STATUS_STOP_REQUESTED) {
+ } else if (isStopRequestedStatus(runStatus)) {
buttonIconName = 'ot-spinner'
buttonText = t('canceling_run')
} else if (isStartRunStatus(runStatus)) {
@@ -138,17 +166,21 @@ export function useActionButtonProperties({
buttonText =
runStatus === RUN_STATUS_IDLE ? t('start_run') : t('resume_run')
handleButtonClick = () => {
+ if (isDisabled && disabledReason) {
+ makeSnackbar(disabledReason)
+ return
+ }
if (isHeaterShakerShaking && isHeaterShakerInProtocol) {
runHeaderModalContainerUtils.HSRunningModalUtils.toggleModal?.()
} else if (
missingSetupSteps.length !== 0 &&
- (runStatus === RUN_STATUS_IDLE || runStatus === RUN_STATUS_STOPPED)
+ isModuleConfirmationStatus(runStatus)
) {
confirmMissingSteps()
} else if (
isHeaterShakerInProtocol &&
!isHeaterShakerShaking &&
- (runStatus === RUN_STATUS_IDLE || runStatus === RUN_STATUS_STOPPED)
+ isModuleConfirmationStatus(runStatus)
) {
confirmAttachment()
}
@@ -190,6 +222,5 @@ export function useActionButtonProperties({
})
}
}
-
return { buttonText, handleButtonClick, buttonIconName }
}
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/index.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/index.tsx
index b6b57f4ed90..55b7cdeecdf 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/index.tsx
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/RunHeaderContent/ActionButton/index.tsx
@@ -12,30 +12,17 @@ import {
SIZE_1,
SPACING,
StyledText,
- Tooltip,
- useHoverTooltip,
} from '@opentrons/components'
+import { isValidRunAgainStatus } from '/app/local-resources/runs/utils'
import { useRobotAnalyticsData } from '/app/redux-resources/analytics'
-import { useIsFlex, useRobot } from '/app/redux-resources/robots'
-import {
- getCameraUsageState,
- selectIsAnyNecessaryDefaultOffsetMissing,
-} from '/app/redux/protocol-runs'
+import { useRobot } from '/app/redux-resources/robots'
+import { getCameraUsageState } from '/app/redux/protocol-runs'
import { useIsRobotOnWrongVersionOfSoftware } from '/app/redux/robot-update'
-import {
- useCurrentRunId,
- useModuleCalibrationStatus,
- useProtocolDetailsForRun,
- useRunCalibrationStatus,
- useUnmatchedModulesForProtocol,
-} from '/app/resources/runs'
+import { useCurrentRunId, useProtocolDetailsForRun } from '/app/resources/runs'
-import {
- getFallbackRobotSerialNumber,
- isValidRunAgainStatus,
-} from '../../utils'
-import { useActionBtnDisabledUtils, useActionButtonProperties } from './hooks'
+import { getFallbackRobotSerialNumber } from '../../utils'
+import { useActionButtonProperties } from './hooks'
import type { MutableRefObject } from 'react'
import type { State } from '/app/redux/types'
@@ -60,26 +47,10 @@ export function ActionButton(props: ActionButtonProps): JSX.Element {
} = props
const { missingStepsModalUtils, HSConfirmationModalUtils } =
runHeaderModalContainerUtils
-
- const isFlex = useIsFlex(robotName)
- const [targetProps, tooltipProps] = useHoverTooltip()
const { isProtocolAnalyzing, protocolData } = useProtocolDetailsForRun(runId)
- const { missingModuleIds } = useUnmatchedModulesForProtocol(robotName, runId)
- const { complete: isCalibrationComplete } = useRunCalibrationStatus(
- robotName,
- runId
- )
- const { complete: isModuleCalibrationComplete } = useModuleCalibrationStatus(
- robotName,
- runId
- )
const isRobotOnWrongVersionOfSoftware =
useIsRobotOnWrongVersionOfSoftware(robotName)
const currentRunId = useCurrentRunId()
- const isRequiredOffsetMissing = useSelector(
- selectIsAnyNecessaryDefaultOffsetMissing(runId)
- )
-
const { enabled: isCameraEnabled } = useSelector((state: State) =>
getCameraUsageState(state, runId)
)
@@ -90,38 +61,14 @@ export function ActionButton(props: ActionButtonProps): JSX.Element {
const isCameraReadyToRun = isCameraRequiredForRun ? isCameraEnabled : true
const areCameraPreferencesConfirmed = runRecord?.data.cameraSettings != null
- const isSetupComplete =
- isCalibrationComplete &&
- isModuleCalibrationComplete &&
- missingModuleIds.length === 0 &&
- isCameraReadyToRun
- const isRobotTypeSetupComplete = isFlex
- ? isSetupComplete && !isRequiredOffsetMissing
- : isSetupComplete
-
- const isCurrentRun = currentRunId === runId
const isOtherRunCurrent = currentRunId != null && currentRunId !== runId
const isProtocolNotReady = protocolData == null || !!isProtocolAnalyzing
const isValidRunAgain = isValidRunAgainStatus(runStatus, isClosingCurrentRun)
- const { isDisabled, disabledReason } = useActionBtnDisabledUtils({
- isCurrentRun,
- isSetupComplete: isRobotTypeSetupComplete,
- isOtherRunCurrent,
- isProtocolNotReady,
- isRobotOnWrongVersionOfSoftware,
- isValidRunAgain,
- isCameraReadyToRun,
- ...props,
- })
-
const robot = useRobot(robotName)
const robotSerialNumber = getFallbackRobotSerialNumber(robot)
const robotAnalyticsData = useRobotAnalyticsData(robotName)
- const validRunAgainButRequiresSetup =
- isValidRunAgain && !isRobotTypeSetupComplete
-
const { buttonText, handleButtonClick, buttonIconName } =
useActionButtonProperties({
isProtocolNotReady,
@@ -136,9 +83,9 @@ export function ActionButton(props: ActionButtonProps): JSX.Element {
isOtherRunCurrent,
isRobotOnWrongVersionOfSoftware,
areCameraPreferencesConfirmed,
+ isCameraReadyToRun,
...props,
})
-
return (
<>
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/SetupRobotCalibration.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/SetupRobotCalibration.tsx
index e8cb5400da8..4d5c1a62046 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/SetupRobotCalibration.tsx
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/SetupRobotCalibration.tsx
@@ -17,7 +17,11 @@ import {
ANALYTICS_PROCEED_TO_MODULE_SETUP_STEP,
useTrackEvent,
} from '/app/redux/analytics'
-import { useRunHasStarted, useRunStatus } from '/app/resources/runs'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useNotifyRunQuery,
+ useRunHasStarted,
+} from '/app/resources/runs'
import { SetupDeckCalibration } from './SetupDeckCalibration'
import { SetupInstrumentCalibration } from './SetupInstrumentCalibration'
@@ -50,7 +54,11 @@ export function SetupRobotCalibration({
const trackEvent = useTrackEvent()
const runHasStarted = useRunHasStarted(runId)
- const runStatus = useRunStatus(runId)
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
+
const isFlex = useIsFlex(robotName)
let tooltipText: string | null = null
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/ProtocolRunRuntimeParameters.test.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/ProtocolRunRuntimeParameters.test.tsx
index 2a0f071ffe3..358cec233b2 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/ProtocolRunRuntimeParameters.test.tsx
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/ProtocolRunRuntimeParameters.test.tsx
@@ -7,9 +7,9 @@ import { InfoScreen } from '@opentrons/components'
import { renderWithProviders } from '/app/__testing-utils__'
import { i18n } from '/app/i18n'
import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
useMostRecentCompletedAnalysis,
useNotifyRunQuery,
- useRunStatus,
} from '/app/resources/runs'
import {
mockIdleUnstartedRun,
@@ -121,10 +121,11 @@ describe('ProtocolRunRuntimeParameters', () => {
.thenReturn({
runTimeParameters: mockRunTimeParameterData,
} as CompletedProtocolAnalysis)
- vi.mocked(useRunStatus).mockReturnValue('running')
- vi.mocked(useNotifyRunQuery).mockReturnValue({
- data: { data: mockSucceededRun },
- } as unknown as UseQueryResult)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
+ .thenReturn({
+ data: { data: mockSucceededRun },
+ } as unknown as UseQueryResult)
})
afterEach(() => {
@@ -133,7 +134,7 @@ describe('ProtocolRunRuntimeParameters', () => {
it('should render title, and banner when RunTimeParameters are not empty and all values are default', () => {
when(useNotifyRunQuery)
- .calledWith(RUN_ID)
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
.thenReturn({
data: {
data: mockIdleUnstartedRun,
@@ -163,7 +164,7 @@ describe('ProtocolRunRuntimeParameters', () => {
],
} as CompletedProtocolAnalysis)
when(useNotifyRunQuery)
- .calledWith(RUN_ID)
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
.thenReturn({
data: {
data: mockIdleUnstartedRun,
@@ -180,7 +181,7 @@ describe('ProtocolRunRuntimeParameters', () => {
it('should render title, and banner when RunTimeParameters from view protocol run record overflow menu button', () => {
when(useNotifyRunQuery)
- .calledWith(RUN_ID)
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
.thenReturn({
data: {
data: {
@@ -203,7 +204,6 @@ describe('ProtocolRunRuntimeParameters', () => {
],
} as CompletedProtocolAnalysis)
- vi.mocked(useRunStatus).mockReturnValue('succeeded')
render(props)
screen.getByText('Download files')
screen.getByText(
@@ -212,6 +212,21 @@ describe('ProtocolRunRuntimeParameters', () => {
})
it('should render RunTimeParameters when RunTimeParameters are not empty', () => {
+ when(useNotifyRunQuery)
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
+ .thenReturn({
+ data: {
+ data: {
+ ...mockSucceededRun,
+ runTimeParameters: mockRunTimeParameterData,
+ },
+ },
+ } as any)
+ when(vi.mocked(useMostRecentCompletedAnalysis))
+ .calledWith(RUN_ID)
+ .thenReturn({
+ runTimeParameters: [] as RunTimeParameter[],
+ } as CompletedProtocolAnalysis)
render(props)
screen.getByText('Dry Run')
screen.getByText('Off')
@@ -236,6 +251,16 @@ describe('ProtocolRunRuntimeParameters', () => {
})
it('should render csv row if a protocol requires a csv', () => {
+ when(useNotifyRunQuery)
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
+ .thenReturn({
+ data: {
+ data: {
+ ...mockSucceededRun,
+ runTimeParameters: [mockRunTimeParameterData, mockCsvRtp],
+ },
+ },
+ } as any)
vi.mocked(useMostRecentCompletedAnalysis).mockReturnValue({
runTimeParameters: [...mockRunTimeParameterData, mockCsvRtp],
} as CompletedProtocolAnalysis)
diff --git a/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/SetupRobotCalibration.test.tsx b/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/SetupRobotCalibration.test.tsx
index f78027ef390..f14f385a171 100644
--- a/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/SetupRobotCalibration.test.tsx
+++ b/app/src/organisms/Desktop/Devices/ProtocolRun/__tests__/SetupRobotCalibration.test.tsx
@@ -2,6 +2,8 @@ import { fireEvent, screen } from '@testing-library/react'
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'
import { when } from 'vitest-when'
+import { RUN_STATUS_STOPPED } from '@opentrons/api-client'
+
import { renderWithProviders } from '/app/__testing-utils__'
import { i18n } from '/app/i18n'
import { useIsFlex } from '/app/redux-resources/robots'
@@ -10,7 +12,11 @@ import {
useTrackEvent,
} from '/app/redux/analytics'
import { mockDeckCalData } from '/app/redux/calibration/__fixtures__'
-import { useRunHasStarted } from '/app/resources/runs'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useNotifyRunQuery,
+ useRunHasStarted,
+} from '/app/resources/runs'
import { useDeckCalibrationData } from '../../hooks'
import { SetupDeckCalibration } from '../SetupDeckCalibration'
@@ -73,6 +79,17 @@ describe('SetupRobotCalibration', () => {
})
when(vi.mocked(useRunHasStarted)).calledWith(RUN_ID).thenReturn(false)
when(vi.mocked(useIsFlex)).calledWith(ROBOT_NAME).thenReturn(false)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
+ .thenReturn({
+ data: {
+ data: {
+ id: RUN_ID,
+ status: RUN_STATUS_STOPPED,
+ errors: [],
+ },
+ },
+ } as any)
})
afterEach(() => {
vi.resetAllMocks()
diff --git a/app/src/organisms/Desktop/Devices/RecentProtocolRuns.tsx b/app/src/organisms/Desktop/Devices/RecentProtocolRuns.tsx
index de9164bf127..8cd43c054d7 100644
--- a/app/src/organisms/Desktop/Devices/RecentProtocolRuns.tsx
+++ b/app/src/organisms/Desktop/Devices/RecentProtocolRuns.tsx
@@ -40,13 +40,7 @@ export function RecentProtocolRuns({
const currentRunId = useCurrentRunId()
const { isRunTerminal } = useRunStatuses()
const robotIsBusy = currentRunId != null ? !isRunTerminal : false
- const nonQuickTransferRuns = runs?.filter(run => {
- const protocol = protocols?.data?.data.find(
- protocol => protocol.id === run.protocolId
- )
- return protocol?.protocolKind !== 'quick-transfer'
- })
-
+ const allRunsMutable = [...(runs ?? [])]
return (
- {isRobotViewable &&
- nonQuickTransferRuns &&
- nonQuickTransferRuns?.length > 0 && (
- <>
- 0 && (
+ <>
+
+
-
- {t('run')}
-
-
- {t('protocol')}
-
-
- {t('files')}
-
-
- {t('status')}
-
-
- {t('run_duration')}
-
-
- {nonQuickTransferRuns
- .sort(
- (a, b) =>
- new Date(b.createdAt).getTime() -
- new Date(a.createdAt).getTime()
- )
+ {t('run')}
+
+
+ {t('protocol')}
+
+
+ {t('files')}
+
+
+ {t('status')}
+
+
+ {t('run_duration')}
+
+
+ {allRunsMutable
+ .sort(
+ (a, b) =>
+ new Date(b.createdAt).getTime() -
+ new Date(a.createdAt).getTime()
+ )
- .map((run, index) => {
- const protocol = protocols?.data?.data.find(
- protocol => protocol.id === run.protocolId
- )
- const protocolName =
- protocol?.metadata.protocolName ??
- protocol?.files[0].name ??
- t('shared:loading') ??
- ''
+ .map((run, index) => {
+ const protocol = protocols?.data?.data.find(
+ protocol => protocol.id === run.protocolId
+ )
+ const protocolName =
+ protocol?.metadata.protocolName ??
+ protocol?.files[0].name ??
+ t('shared:loading') ??
+ ''
- return (
-
)}
- {isRobotViewable &&
- (nonQuickTransferRuns == null ||
- nonQuickTransferRuns.length === 0) && (
-
- {t('no_protocol_runs')}
-
- )}
+ {isRobotViewable && allRunsMutable?.length === 0 && (
+
+ {t('no_protocol_runs')}
+
+ )}
)
diff --git a/app/src/organisms/Desktop/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx b/app/src/organisms/Desktop/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx
index 982bb04cd3b..72cebaf7e30 100644
--- a/app/src/organisms/Desktop/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx
+++ b/app/src/organisms/Desktop/Devices/RobotSettings/AdvancedTab/UpdateRobotSoftware.tsx
@@ -21,7 +21,7 @@ import {
import { TertiaryButton } from '/app/atoms/buttons'
import { ExternalLink } from '/app/atoms/Link/ExternalLink'
-import { isTerminalRunStatus } from '/app/organisms/Desktop/Devices/ProtocolRun/ProtocolRunHeader/utils'
+import { isTerminalRunStatus } from '/app/local-resources/runs/utils'
import { getRobotUpdateDisplayInfo } from '/app/redux/robot-update'
import { useDispatchStartRobotUpdate } from '/app/redux/robot-update/hooks'
import { remote } from '/app/redux/shell/remote'
diff --git a/app/src/organisms/Desktop/Devices/RobotSettings/RobotSettingsCamera/RobotSettingsCameraControls.tsx b/app/src/organisms/Desktop/Devices/RobotSettings/RobotSettingsCamera/RobotSettingsCameraControls.tsx
index 4d401012493..cf73f6a57ad 100644
--- a/app/src/organisms/Desktop/Devices/RobotSettings/RobotSettingsCamera/RobotSettingsCameraControls.tsx
+++ b/app/src/organisms/Desktop/Devices/RobotSettings/RobotSettingsCamera/RobotSettingsCameraControls.tsx
@@ -3,6 +3,7 @@ import { createPortal } from 'react-dom'
import { useTranslation } from 'react-i18next'
import { StyledText } from '@opentrons/components'
+import { useCreateCameraImageSettings } from '@opentrons/react-api-client'
import { getTopPortalEl } from '/app/App/portal'
import { TertiaryButton } from '/app/atoms/buttons'
@@ -14,7 +15,7 @@ import type { JSX } from 'react'
export function RobotSettingsCameraControls(): JSX.Element {
const { t } = useTranslation('device_settings')
const [showControls, setShowControls] = useState(false)
-
+ const { createCameraImageSettings } = useCreateCameraImageSettings()
const toggleControls = (): void => {
setShowControls(!showControls)
}
@@ -41,7 +42,10 @@ export function RobotSettingsCameraControls(): JSX.Element {
{showControls &&
createPortal(
- mock HistoricalProtocolRunOverflowMenu
)
- vi.mocked(useRunStatus).mockReturnValue('succeeded')
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith('fakeRunId', {
+ staleTime: Infinity,
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({ data: { data: run } } as UseQueryResult
-
- {groupedCommandsHighlightedInfo != null &&
- groupedCommandsHighlightedInfo.length > 0
- ? groupedCommandsHighlightedInfo.map((group, index) => {
- const nextIndex = groupedCommandsHighlightedInfo[index + 1]
- const nextIsGrouped =
- nextIndex != null && 'annotationIndex' in nextIndex
+ <>
+ {showErrorDetailsModal ? (
+ {
+ setShowErrorDetailsModal(false)
+ }}
+ />
+ ) : null}
+
+
- {t('timeline')}
+ {t('protocol_steps')}
{t('percent_complete', { percent: percentComplete.toFixed(0) })}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/Controls/__tests__/Controls.test.tsx b/app/src/organisms/Desktop/ProtocolVisualization/Controls/__tests__/Controls.test.tsx
index bdfac44f291..645f2e6330d 100644
--- a/app/src/organisms/Desktop/ProtocolVisualization/Controls/__tests__/Controls.test.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/Controls/__tests__/Controls.test.tsx
@@ -39,7 +39,6 @@ describe('Controls', () => {
isPlaying: false,
commands: [],
groupedCommands: null,
- spotlightWindowData: {} as any, // TODO (kk, 2025-11-10): update this later
milliSecondsPerFrame: 2000,
setMilliSecondsPerFrame: vi.fn(),
}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/Controls/index.tsx b/app/src/organisms/Desktop/ProtocolVisualization/Controls/index.tsx
index 42d77b64eaa..7034dedb352 100644
--- a/app/src/organisms/Desktop/ProtocolVisualization/Controls/index.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/Controls/index.tsx
@@ -1,6 +1,5 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
-import { useDispatch } from 'react-redux'
import {
Chip,
@@ -12,8 +11,6 @@ import {
TimelineScrubber,
} from '@opentrons/components'
-import { stepDetailViewerUpdateAction } from '/app/redux/shell'
-
import styles from './controls.module.css'
import { PerStepOverflowMenu } from './PerStepOverflowMenu'
@@ -23,12 +20,7 @@ import { PerStepOverflowMenu } from './PerStepOverflowMenu'
// } from './utils'
import type { Dispatch, SetStateAction } from 'react'
-import type {
- Liquid,
- ProtocolAnalysisOutput,
- RunTimeCommand,
-} from '@opentrons/shared-data'
-import type { InvariantContext, RobotState } from '@opentrons/step-generation'
+import type { RunTimeCommand } from '@opentrons/shared-data'
import type { GroupedCommands } from '/app/redux/protocol-storage'
interface ControlsProps {
@@ -41,15 +33,6 @@ interface ControlsProps {
isPlaying: boolean
commands: RunTimeCommand[]
groupedCommands: GroupedCommands | null
- spotlightWindowData: {
- protocolKey: string
- robotState: RobotState
- invariantContext: InvariantContext
- analysis: ProtocolAnalysisOutput
- liquids: Liquid[]
- slot: string | null
- command?: RunTimeCommand
- }
milliSecondsPerFrame: number
setMilliSecondsPerFrame: Dispatch>
}
@@ -64,40 +47,12 @@ export function Controls(props: ControlsProps): JSX.Element {
isPlaying,
commands,
// groupedCommands,
- spotlightWindowData,
milliSecondsPerFrame,
setMilliSecondsPerFrame,
} = props
const { t } = useTranslation('protocol_visualization')
- const dispatch = useDispatch()
const [showPerStepOverflowMenu, setShowPerStepOverflowMenu] = useState(false)
- // ToDo (kk: 2025-10-03) the following will be used when TimelineScrubber is added to this component
- // const currentCommandId = commands[currentCommandIndex].id
- // const nextGroupFirstCommandId = getNextGroupFirstCommandId(
- // groupedCommands,
- // currentCommandId
- // )
- // const previousGroupFirstCommandId = getPreviousGroupFirstCommandId(
- // groupedCommands,
- // currentCommandId
- // )
-
- // const handleBack = (): void => {
- // if (previousGroupFirstCommandId != null) {
- // setSelectedCommand(previousGroupFirstCommandId)
- // } else {
- // setSelectedCommand(commands[0].id)
- // }
- // }
- // const handleForward = (): void => {
- // if (nextGroupFirstCommandId != null) {
- // setSelectedCommand(nextGroupFirstCommandId)
- // } else {
- // setSelectedCommand(commands[commands.length - 1].id)
- // }
- // }
-
const handlePerStepOverflowClick = (): void => {
setShowPerStepOverflowMenu(
showPerStepOverflowMenu => !showPerStepOverflowMenu
@@ -114,24 +69,8 @@ export function Controls(props: ControlsProps): JSX.Element {
numCommandLength - 1
)
- setSelectedCommand(commands[nextIndex].id)
-
- if (
- spotlightWindowData.slot != null &&
- spotlightWindowData.command != null
- ) {
- dispatch(
- stepDetailViewerUpdateAction({
- protocolKey: spotlightWindowData.protocolKey,
- slot: spotlightWindowData.slot,
- command: spotlightWindowData.command,
- robotState: spotlightWindowData.robotState,
- invariantContext: spotlightWindowData.invariantContext,
- analysis: spotlightWindowData.analysis,
- liquids: spotlightWindowData.liquids,
- })
- )
- }
+ const nextCommandId = commands[nextIndex].id
+ setSelectedCommand(nextCommandId)
}
const currentProgress =
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewDetails.tsx b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewDetails.tsx
similarity index 94%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewDetails.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewDetails.tsx
index d2f0bf75bf8..57caf962eb7 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewDetails.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewDetails.tsx
@@ -1,14 +1,12 @@
import { FLEX_ROBOT_TYPE } from '@opentrons/shared-data'
+import { getFixtureSummaryInfo } from '../utils/getFixtureSummaryInfo'
+import { getSlotIdsBlockedBySpanningForThermocycler } from '../utils/getSlotIdsBlockedBySpanningForThermocycler'
import { DeckViewLabware } from './DeckViewLabware'
import { DeckViewModules } from './DeckViewModules'
import { DeckViewSlots } from './DeckViewSlots'
import { FixtureCommandSummary } from './FixtureCommandSummary'
import { Ot2FixedTrashCommandSummary } from './Ot2FixedTrashCommandSummary'
-import {
- getFixtureSummaryInfo,
- getSlotIdsBlockedBySpanningForThermocycler,
-} from './utils'
import type { Dispatch, SetStateAction } from 'react'
import type {
@@ -22,7 +20,7 @@ import type {
InvariantContext,
TimelineFrame,
} from '@opentrons/step-generation'
-import type { LabwareEntityExtended } from './DeckView'
+import type { LabwareEntityExtended } from '.'
interface DeckViewDetailsProps {
labwareEntitiesExtended: Record
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewLabware.tsx b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewLabware.tsx
similarity index 97%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewLabware.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewLabware.tsx
index f9e516790d9..2384df27de6 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewLabware.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewLabware.tsx
@@ -7,10 +7,10 @@ import {
} from '@opentrons/shared-data'
import { getSlotInLocationStack } from '@opentrons/step-generation'
+import { getActiveLayer } from '../utils/getActiveLayer'
import { DeckViewOverlay } from './DeckViewOverlay'
import { LabwareCommandSummary } from './LabwareCommandSummary'
import { LabwareOnDeck } from './LabwareOnDeck'
-import { getActiveLayer } from './utils'
import type { Dispatch, SetStateAction } from 'react'
import type {
@@ -20,7 +20,7 @@ import type {
RunTimeCommand,
} from '@opentrons/shared-data'
import type { InvariantContext, RobotState } from '@opentrons/step-generation'
-import type { LabwareEntityExtended } from './DeckView'
+import type { LabwareEntityExtended } from '.'
interface DeckViewLabwareProps {
robotState: RobotState
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewModules.tsx b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewModules.tsx
similarity index 95%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewModules.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewModules.tsx
index 3032a579821..d7bf22fa710 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewModules.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewModules.tsx
@@ -8,14 +8,12 @@ import {
THERMOCYCLER_MODULE_TYPE,
} from '@opentrons/shared-data'
+import { getActiveLayer } from '../utils/getActiveLayer'
+import { getModuleInnerProps } from '../utils/getModuleInnerProps'
+import { getTopmostLabwareOnModuleFromStack } from '../utils/getTopmostLabwareOnModuleFromStack'
import { DeckViewOverlay } from './DeckViewOverlay'
import { LabwareOnDeck } from './LabwareOnDeck'
import { ModuleCommandSummary } from './ModuleCommandSummary'
-import {
- getActiveLayer,
- getModuleInnerProps,
- getTopmostLabwareOnModuleFromStack,
-} from './utils'
import type { Dispatch, SetStateAction } from 'react'
import type { ThermocyclerVizProps } from '@opentrons/components'
@@ -26,7 +24,7 @@ import type {
RunTimeCommand,
} from '@opentrons/shared-data'
import type { InvariantContext, RobotState } from '@opentrons/step-generation'
-import type { LabwareEntityExtended } from './DeckView'
+import type { LabwareEntityExtended } from '../../../../organisms/Desktop/ProtocolVisualization/DeckView'
interface DeckViewModulesProps {
robotState: RobotState
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewOverlay/deckviewoverlay.module.css b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewOverlay/deckviewoverlay.module.css
new file mode 100644
index 00000000000..3858fb22294
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewOverlay/deckviewoverlay.module.css
@@ -0,0 +1,18 @@
+.deck_overlay {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ align-items: flex-end;
+ justify-content: center;
+ border-radius: var(--border-radius-4);
+ background-color: transparent;
+ gap: var(--spacing-8);
+}
+
+.text_background {
+ display: flex;
+ width: 100%;
+ justify-content: center;
+ border-radius: 0 0 var(--border-radius-4) var(--border-radius-4);
+ background-color: var(--slot-fill-color);
+}
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewOverlay.tsx b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewOverlay/index.tsx
similarity index 98%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewOverlay.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewOverlay/index.tsx
index 4b0364bfc00..2fe04fd3635 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/DeckViewOverlay.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/DeckView/DeckViewOverlay/index.tsx
@@ -20,7 +20,7 @@ import {
THERMOCYCLER_MODULE_TYPE,
} from '@opentrons/shared-data'
-import styles from './visualization.module.css'
+import styles from './deckviewoverlay.module.css'
import type { Dispatch, ReactNode, SetStateAction } from 'react'
import type {
@@ -71,7 +71,7 @@ export function DeckViewOverlay(props: SlotOverlayProps): JSX.Element | null {
const stagingAreaLocations = Object.values(stagingAreaEntities)?.map(
stagingArea => stagingArea.location as string
)
- const wasteChuteOnSlot =
+ const isWasteChuteOnSlot =
Object.values(wasteChuteEntities).length > 0 && slotId === 'D3'
const cutoutId =
@@ -138,7 +138,7 @@ export function DeckViewOverlay(props: SlotOverlayProps): JSX.Element | null {
{/* This is to render the waste chute above the hover border - very gnarly but this
is what design wanted */}
- {wasteChuteOnSlot != null ? (
+ {isWasteChuteOnSlot ? (
-
+ {groupedCommandsHighlightedInfo != null &&
+ groupedCommandsHighlightedInfo.length > 0
+ ? groupedCommandsHighlightedInfo.map((group, index) => {
+ const nextIndex = groupedCommandsHighlightedInfo[index + 1]
+ const nextIsGrouped =
+ nextIndex != null && 'annotationIndex' in nextIndex
- if ('annotationIndex' in group) {
- const subCommandStartNumber = commandNumber + 1 // Starting number for this group
- commandNumber += group.subCommands.length
+ if ('annotationIndex' in group) {
+ const subCommandStartNumber = commandNumber + 1 // Starting number for this group
+ commandNumber += group.subCommands.length
- return (
-
+
)
}
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/__tests__/CommandSteps.test.tsx b/app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/__tests__/CommandSteps.test.tsx
similarity index 96%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/__tests__/CommandSteps.test.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/__tests__/CommandSteps.test.tsx
index e552e8ceef1..ee3d758e03f 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/__tests__/CommandSteps.test.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/__tests__/CommandSteps.test.tsx
@@ -32,7 +32,7 @@ describe('CommandSteps', () => {
})
it('should render header text', () => {
render(props)
- screen.getByText('Timeline')
+ screen.getByText('Protocol Steps')
screen.getByText('50% complete')
})
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/commandsteps.module.css b/app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/commandsteps.module.css
similarity index 97%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/commandsteps.module.css
rename to app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/commandsteps.module.css
index b4263566435..1037eaa8efe 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/commandsteps.module.css
+++ b/app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/commandsteps.module.css
@@ -30,7 +30,7 @@
}
.command_step_groups {
- height: 39rem;
+ height: 100%;
min-height: 0;
flex: 1;
overflow-y: auto;
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/index.tsx b/app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/index.tsx
similarity index 98%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/index.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/index.tsx
index b5f4edfbbc0..1609b1dd612 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/CommandSteps/index.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/CommandSteps/index.tsx
@@ -33,7 +33,7 @@ export function CommandSteps(props: CommandStepsProps): JSX.Element {
- {analysis?.errors.map(error => (
-
-
-
+ {analysis?.errors.map(error => (
+
- {error.detail}
+ {t('unable_to_show_steps_past_errors')}
- ))}
-
- ) : null}
+ ) : null}
+ {
+ setShowErrorDetailsModal(true)
+ }}
+ >
+
+ {error.detail}
+
+
+ ))}
+
+
+
-
- Unable to show steps past errors
-
-
-
-
- {t('deck_view')}
-
-
- {t('step', { number: selectedCommandIndex })}
-
-
+
) => {
return renderWithProviders(
-
-const VOLUME_SIG_DIGITS_DEFAULT = 2
-export const formatVolume = (
- inputVolume?: string | number | null,
- sigDigits: number = VOLUME_SIG_DIGITS_DEFAULT
-): string => {
- if (typeof inputVolume === 'number') {
- const digits = inputVolume.toString().includes('.') ? sigDigits : 0
- return String(round(inputVolume, digits))
- }
- return inputVolume || ''
-}
-
-const PERCENTAGE_DECIMALS_ALLOWED = 1
-export const formatPercentage = (part: number, total: number): string =>
- `${round((part / total) * 100, PERCENTAGE_DECIMALS_ALLOWED)}%`
-
-export const getAllWellContentsAtFrame = (
- liquidState: RobotState['liquidState'],
- labwareDef: LabwareDefinition2
-): WellContentsByLabware => {
- const labwareLiquidState = liquidState.labware
- const wellContentsByLabwareId = mapValues(
- labwareLiquidState,
- (labwareLiquids: SingleLabwareLiquidState, labwareId: string) => {
- return _wellContentsForLabware(labwareLiquids, labwareDef)
- }
- )
- return wellContentsByLabwareId
-}
-
-const getSlotFromPipetteLocation = (
- entityUnderPipette: string,
- labware: RobotState['labware'],
- trashBinEntities: TrashBinEntities,
- wasteChuteEntities: WasteChuteEntities
-): string | null => {
- if (labware[entityUnderPipette] != null) {
- return getSlotInLocationStack(labware[entityUnderPipette].stack)
- } else if (trashBinEntities[entityUnderPipette] != null) {
- return trashBinEntities[entityUnderPipette].location.split('cutout')[1]
- } else if (wasteChuteEntities[entityUnderPipette] != null) {
- return wasteChuteEntities[entityUnderPipette].location.split('cutout')[1]
- } else
- console.warn(
- `expected to find slot assosciated with piette location ${entityUnderPipette} but could not`
- )
- return null
-}
-
-export const getActiveSlotForLabwareDetails = (
- robotState: RobotState,
- invariantContext: InvariantContext,
- currentCommand: RunTimeCommand
-): DeckSlot | null => {
- const { labware, pipettes } = robotState
- const { trashBinEntities, wasteChuteEntities, labwareEntities } =
- invariantContext
- const entityUnderPipette = Object.values(pipettes).find(
- pipette => pipette.entityId != null
- )?.entityId
- let slot = null
-
- if (entityUnderPipette != null) {
- slot = getSlotFromPipetteLocation(
- entityUnderPipette,
- labware,
- trashBinEntities,
- wasteChuteEntities
- )
- } else if ('labwareId' in currentCommand.params) {
- const isTiprack =
- labwareEntities[currentCommand.params.labwareId].def.parameters.isTiprack
- if (!isTiprack) {
- slot = currentCommand.params.labwareId
- }
- }
-
- return slot
-}
-
-export const getActiveSlotForTiprackDetails = (
- pipettes: PipetteTemporalProperties[],
- robotState: RobotState,
- invariantContext: InvariantContext
-): DeckSlot | null => {
- const { labware } = robotState
- const { trashBinEntities, wasteChuteEntities } = invariantContext
- const tiprackUnderPipette = pipettes.find(
- pipette => pipette.tiprackId != null
- )?.tiprackId
- let slot = null
-
- if (tiprackUnderPipette != null) {
- slot = getSlotFromPipetteLocation(
- tiprackUnderPipette,
- labware,
- trashBinEntities,
- wasteChuteEntities
- )
- }
-
- return slot
-}
-
-export const getMissingTips = (
- tipState: RobotState['tipState'],
- labwareId: string
-): WellGroup | null => {
- const missingTipsByLabwareId =
- tipState &&
- mapValues(tipState.tipracks, tipMap =>
- reduce(
- tipMap,
- (acc, hasTip, wellName): WellGroup =>
- hasTip ? acc : { ...acc, [wellName]: null },
- {}
- )
- )
- const missingTips = missingTipsByLabwareId
- ? missingTipsByLabwareId[labwareId]
- : null
-
- return missingTips
-}
-
-interface TipSvgInfo {
- tipColor: string
- tipCurrentVolume: number
-}
-
-export const getTipSvgInfo = (
- pipetteLocationLiquidState: LocationLiquidState,
- liquids: Liquid[]
-): TipSvgInfo => {
- const ingredIds = Object.keys(pipetteLocationLiquidState)
- const colorsInTip = liquids.reduce(
- (acc, { id, displayColor }) =>
- ingredIds.includes(id) && displayColor ? [...acc, displayColor] : acc,
- []
- )
- const tipColor =
- colorsInTip.length > 1 ? COLORS.grey40 : (colorsInTip[0] ?? COLORS.grey40)
- const tipCurrentVolume = Object.values(pipetteLocationLiquidState).reduce(
- (sum, { volume }) => sum + volume,
- 0
- )
- return { tipColor, tipCurrentVolume }
-}
-
-export const getWellVolume = (
- labwareLocationLiquidState: LocationLiquidState
-): number =>
- Object.entries(labwareLocationLiquidState).reduce(
- (sum, [id, volume]) => (id !== AIR ? sum + volume.volume : sum),
- 0
- )
-
-export const getIsPipetteActive = (
- side: PipetteMount,
- pipettes: RobotState['pipettes'],
- currentCommand: RunTimeCommand
-): boolean => {
- const pipetteId =
- Object.entries(pipettes ?? {}).find(
- ([_, pipette]) => pipette.mount === side
- )?.[0] ?? null
- return (
- 'pipetteId' in currentCommand.params &&
- currentCommand.params.pipetteId === pipetteId &&
- pipetteId != null &&
- pipettes[pipetteId].entityId != null
- )
-}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/formatPercentage.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/formatPercentage.ts
new file mode 100644
index 00000000000..a8cc0a7aea8
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/formatPercentage.ts
@@ -0,0 +1,6 @@
+import round from 'lodash/round'
+
+const PERCENTAGE_DECIMALS_ALLOWED = 1
+
+export const formatPercentage = (part: number, total: number): string =>
+ `${round((part / total) * 100, PERCENTAGE_DECIMALS_ALLOWED)}%`
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/formatVolume.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/formatVolume.ts
new file mode 100644
index 00000000000..06dbb830621
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/formatVolume.ts
@@ -0,0 +1,13 @@
+import round from 'lodash/round'
+
+const VOLUME_SIG_DIGITS_DEFAULT = 2
+export const formatVolume = (
+ inputVolume?: string | number | null,
+ sigDigits: number = VOLUME_SIG_DIGITS_DEFAULT
+): string => {
+ if (typeof inputVolume === 'number') {
+ const digits = inputVolume.toString().includes('.') ? sigDigits : 0
+ return String(round(inputVolume, digits))
+ }
+ return inputVolume ?? ''
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveLayer.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveLayer.ts
new file mode 100644
index 00000000000..63d9f5f0ed1
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveLayer.ts
@@ -0,0 +1,27 @@
+import type { RunTimeCommand } from '@opentrons/shared-data'
+
+interface ActiveLayer {
+ isActiveLayerVisible: boolean
+}
+
+export const getActiveLayer = (
+ id: string,
+ selectedRunTimeCommand?: RunTimeCommand
+): ActiveLayer => {
+ const isStepAssosciatedWithLabwareId =
+ selectedRunTimeCommand != null &&
+ 'labwareId' in selectedRunTimeCommand.params &&
+ selectedRunTimeCommand.params.labwareId === id
+ const isMoveStepAssosciatedWithLabwareId =
+ selectedRunTimeCommand != null &&
+ selectedRunTimeCommand.commandType === 'moveLabware' &&
+ 'labwareId' in selectedRunTimeCommand.params &&
+ selectedRunTimeCommand.params.labwareId === id
+
+ const isStepAssosciatedWithLabware =
+ isStepAssosciatedWithLabwareId || isMoveStepAssosciatedWithLabwareId
+
+ return {
+ isActiveLayerVisible: isStepAssosciatedWithLabware,
+ }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveSlotForLabwareDetails.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveSlotForLabwareDetails.ts
new file mode 100644
index 00000000000..6a34a3d88bc
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveSlotForLabwareDetails.ts
@@ -0,0 +1,60 @@
+import { getSlotInLocationStack } from '@opentrons/step-generation'
+
+import type { RunTimeCommand } from '@opentrons/shared-data'
+import type {
+ DeckSlot,
+ InvariantContext,
+ RobotState,
+ TrashBinEntities,
+ WasteChuteEntities,
+} from '@opentrons/step-generation'
+
+const getSlotFromPipetteLocation = (
+ entityUnderPipette: string,
+ labware: RobotState['labware'],
+ trashBinEntities: TrashBinEntities,
+ wasteChuteEntities: WasteChuteEntities
+): string | null => {
+ if (labware[entityUnderPipette] != null) {
+ return getSlotInLocationStack(labware[entityUnderPipette].stack)
+ } else if (trashBinEntities[entityUnderPipette] != null) {
+ return trashBinEntities[entityUnderPipette].location.split('cutout')[1]
+ } else if (wasteChuteEntities[entityUnderPipette] != null) {
+ return wasteChuteEntities[entityUnderPipette].location.split('cutout')[1]
+ } else
+ console.warn(
+ `expected to find slot assosciated with piette location ${entityUnderPipette} but could not`
+ )
+ return null
+}
+
+export const getActiveSlotForLabwareDetails = (
+ robotState: RobotState,
+ invariantContext: InvariantContext,
+ currentCommand: RunTimeCommand
+): DeckSlot | null => {
+ const { labware, pipettes } = robotState
+ const { trashBinEntities, wasteChuteEntities, labwareEntities } =
+ invariantContext
+ const entityUnderPipette = Object.values(pipettes).find(
+ pipette => pipette.entityId != null
+ )?.entityId
+ let slot = null
+
+ if (entityUnderPipette != null) {
+ slot = getSlotFromPipetteLocation(
+ entityUnderPipette,
+ labware,
+ trashBinEntities,
+ wasteChuteEntities
+ )
+ } else if ('labwareId' in currentCommand.params) {
+ const isTiprack =
+ labwareEntities[currentCommand.params.labwareId].def.parameters.isTiprack
+ if (!isTiprack) {
+ slot = currentCommand.params.labwareId
+ }
+ }
+
+ return slot
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveSlotForTiprackDetails.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveSlotForTiprackDetails.ts
new file mode 100644
index 00000000000..5e1f194a1d4
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getActiveSlotForTiprackDetails.ts
@@ -0,0 +1,53 @@
+import { getSlotInLocationStack } from '@opentrons/step-generation'
+
+import type {
+ DeckSlot,
+ InvariantContext,
+ PipetteTemporalProperties,
+ RobotState,
+ TrashBinEntities,
+ WasteChuteEntities,
+} from '@opentrons/step-generation'
+
+const getSlotFromPipetteLocation = (
+ entityUnderPipette: string,
+ labware: RobotState['labware'],
+ trashBinEntities: TrashBinEntities,
+ wasteChuteEntities: WasteChuteEntities
+): string | null => {
+ if (labware[entityUnderPipette] != null) {
+ return getSlotInLocationStack(labware[entityUnderPipette].stack)
+ } else if (trashBinEntities[entityUnderPipette] != null) {
+ return trashBinEntities[entityUnderPipette].location.split('cutout')[1]
+ } else if (wasteChuteEntities[entityUnderPipette] != null) {
+ return wasteChuteEntities[entityUnderPipette].location.split('cutout')[1]
+ } else
+ console.warn(
+ `expected to find slot assosciated with piette location ${entityUnderPipette} but could not`
+ )
+ return null
+}
+
+export const getActiveSlotForTiprackDetails = (
+ pipettes: PipetteTemporalProperties[],
+ robotState: RobotState,
+ invariantContext: InvariantContext
+): DeckSlot | null => {
+ const { labware } = robotState
+ const { trashBinEntities, wasteChuteEntities } = invariantContext
+ const tiprackUnderPipette = pipettes.find(
+ pipette => pipette.tiprackId != null
+ )?.tiprackId
+ let slot = null
+
+ if (tiprackUnderPipette != null) {
+ slot = getSlotFromPipetteLocation(
+ tiprackUnderPipette,
+ labware,
+ trashBinEntities,
+ wasteChuteEntities
+ )
+ }
+
+ return slot
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getAllWellContentsAtFrame.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getAllWellContentsAtFrame.ts
new file mode 100644
index 00000000000..a1e960adb7f
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getAllWellContentsAtFrame.ts
@@ -0,0 +1,26 @@
+import mapValues from 'lodash/mapValues'
+
+import { _wellContentsForLabware } from '@opentrons/step-generation'
+
+import type { LabwareDefinition2 } from '@opentrons/shared-data'
+import type {
+ ContentsByWell,
+ RobotState,
+ SingleLabwareLiquidState,
+} from '@opentrons/step-generation'
+
+type WellContentsByLabware = Record
+
+export const getAllWellContentsAtFrame = (
+ liquidState: RobotState['liquidState'],
+ labwareDef: LabwareDefinition2
+): WellContentsByLabware => {
+ const labwareLiquidState = liquidState.labware
+ const wellContentsByLabwareId = mapValues(
+ labwareLiquidState,
+ (labwareLiquids: SingleLabwareLiquidState, labwareId: string) => {
+ return _wellContentsForLabware(labwareLiquids, labwareDef)
+ }
+ )
+ return wellContentsByLabwareId
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getChannels.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getChannels.ts
new file mode 100644
index 00000000000..ab7b96fcdd9
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getChannels.ts
@@ -0,0 +1,18 @@
+import { COLUMN, ROW, SINGLE } from '@opentrons/shared-data'
+
+import type { NozzleConfigurationStyle } from '@opentrons/shared-data'
+
+export const getChannels = (
+ channels: number | null,
+ nozzles?: NozzleConfigurationStyle
+): number => {
+ let numChannels = channels ?? 1
+ if (nozzles === SINGLE) {
+ numChannels = 1
+ } else if (nozzles === COLUMN) {
+ numChannels = 8
+ } else if (nozzles === ROW) {
+ numChannels = 12
+ }
+ return numChannels
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getFixtureSummaryInfo.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getFixtureSummaryInfo.ts
new file mode 100644
index 00000000000..a57b78c98ca
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getFixtureSummaryInfo.ts
@@ -0,0 +1,35 @@
+import { getIsPipetteOverTrash } from './getIsPipetteOverTrash'
+
+import type { CutoutId, RunTimeCommand } from '@opentrons/shared-data'
+import type {
+ RobotState,
+ TrashBinEntities,
+ WasteChuteEntities,
+} from '@opentrons/step-generation'
+
+export const getFixtureSummaryInfo = (
+ pipettes: RobotState['pipettes'],
+ entities: TrashBinEntities | WasteChuteEntities,
+ selectedRunTimeCommand?: RunTimeCommand
+): {
+ isPipetteOverTrash: boolean
+ trashLikeEntityCutoutId: CutoutId | null
+} => {
+ const pipetteCurrentTrashId = Object.values(pipettes).find(
+ pipette => pipette.entityId != null && entities[pipette.entityId] != null
+ )?.entityId
+ const isPipetteOverTrash =
+ pipetteCurrentTrashId != null
+ ? getIsPipetteOverTrash(
+ pipettes,
+ pipetteCurrentTrashId,
+ selectedRunTimeCommand
+ )
+ : false
+ const trashLikeEntityCutoutId =
+ pipetteCurrentTrashId != null
+ ? (entities[pipetteCurrentTrashId].location as CutoutId)
+ : null
+
+ return { isPipetteOverTrash, trashLikeEntityCutoutId }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsCutoutA1Active.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsCutoutA1Active.ts
new file mode 100644
index 00000000000..1d5e254ffdb
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsCutoutA1Active.ts
@@ -0,0 +1,28 @@
+import { THERMOCYCLER_MODULE_TYPE } from '@opentrons/shared-data'
+import { getSlotInLocationStack } from '@opentrons/step-generation'
+
+import { getActiveLayer } from './getActiveLayer'
+
+import type { CutoutId, RunTimeCommand } from '@opentrons/shared-data'
+import type { RobotState } from '@opentrons/step-generation'
+
+export const getIsCutoutA1Active = (
+ labware: RobotState['labware'],
+ modules: RobotState['modules'],
+ cutoutId: CutoutId,
+ selectedRunTimeCommand?: RunTimeCommand
+): boolean => {
+ const labwareOnB1 = Object.entries(labware).find(
+ ([_, lw]) => getSlotInLocationStack(lw.stack) === 'B1'
+ )
+ const hasThermocycler = Object.values(modules).some(
+ module => module.moduleState.type === THERMOCYCLER_MODULE_TYPE
+ )
+
+ const { isActiveLayerVisible: isThermocyclerActive } =
+ labwareOnB1 != null
+ ? getActiveLayer(labwareOnB1[0], selectedRunTimeCommand)
+ : { isActiveLayerVisible: false }
+
+ return isThermocyclerActive && hasThermocycler && cutoutId === 'cutoutA1'
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsPipetteActive.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsPipetteActive.ts
new file mode 100644
index 00000000000..422ed5525db
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsPipetteActive.ts
@@ -0,0 +1,19 @@
+import type { PipetteMount, RunTimeCommand } from '@opentrons/shared-data'
+import type { RobotState } from '@opentrons/step-generation'
+
+export const getIsPipetteActive = (
+ side: PipetteMount,
+ pipettes: RobotState['pipettes'],
+ currentCommand: RunTimeCommand
+): boolean => {
+ const pipetteId =
+ Object.entries(pipettes ?? {}).find(
+ ([_, pipette]) => pipette.mount === side
+ )?.[0] ?? null
+ return (
+ 'pipetteId' in currentCommand.params &&
+ currentCommand.params.pipetteId === pipetteId &&
+ pipetteId != null &&
+ pipettes[pipetteId].entityId != null
+ )
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsPipetteOverTrash.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsPipetteOverTrash.ts
new file mode 100644
index 00000000000..5b549b3a3fe
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getIsPipetteOverTrash.ts
@@ -0,0 +1,18 @@
+import { POTENTIAL_TRASH_COMMAND_TYPES } from '../consants'
+
+import type { RunTimeCommand } from '@opentrons/shared-data'
+import type { RobotState } from '@opentrons/step-generation'
+
+// TODO: the dropTipInPlace, airGapInplace, and
+// blowoutInPlace commands don't have
+// any knowledge of where its dropping. would be
+// nice to expand the results key to include the
+// addressable area name
+export const getIsPipetteOverTrash = (
+ pipettes: RobotState['pipettes'],
+ id: string,
+ selectedRunTimeCommand?: RunTimeCommand
+): boolean =>
+ Object.values(pipettes).some(pipette => pipette.entityId === id) &&
+ selectedRunTimeCommand != null &&
+ POTENTIAL_TRASH_COMMAND_TYPES.includes(selectedRunTimeCommand.commandType)
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getLiquidDetailInfo.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getLiquidDetailInfo.ts
new file mode 100644
index 00000000000..e24c6d2a3a1
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getLiquidDetailInfo.ts
@@ -0,0 +1,36 @@
+import sum from 'lodash/sum'
+
+import { COLORS } from '@opentrons/components'
+import {
+ getLiquidIdsOnLabware,
+ getVolumesPerLiquid,
+} from '@opentrons/step-generation'
+
+import type { Liquid } from '@opentrons/shared-data'
+import type { ContentsByWell } from '@opentrons/step-generation'
+
+interface LiquidDetailInfo {
+ totalVolume: number
+ color: string
+ displayName: string
+}
+
+export const getLiquidDetailInfo = (
+ wellContents: ContentsByWell,
+ liquids: Liquid[]
+): LiquidDetailInfo[] => {
+ const individualIds = getLiquidIdsOnLabware(wellContents)
+ const volumesPerLiquid = getVolumesPerLiquid(wellContents, individualIds)
+ const liquidInfo: LiquidDetailInfo[] = individualIds.map(liquidId => {
+ const totalVolume = sum(Object.values(volumesPerLiquid[liquidId]))
+ const matchingLiquid = liquids.find(liquid => liquid.id === liquidId)
+
+ return {
+ totalVolume,
+ // TODO: add default liquid color
+ color: matchingLiquid?.displayColor ?? COLORS.black70,
+ displayName: matchingLiquid?.displayName ?? 'unknown display name',
+ }
+ })
+ return liquidInfo
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getMissingTips.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getMissingTips.ts
new file mode 100644
index 00000000000..68357e66b88
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getMissingTips.ts
@@ -0,0 +1,26 @@
+import mapValues from 'lodash/mapValues'
+import reduce from 'lodash/reduce'
+
+import type { WellGroup } from '@opentrons/components'
+import type { RobotState } from '@opentrons/step-generation'
+
+export const getMissingTips = (
+ tipState: RobotState['tipState'],
+ labwareId: string
+): WellGroup | null => {
+ const missingTipsByLabwareId =
+ tipState &&
+ mapValues(tipState.tipracks, tipMap =>
+ reduce(
+ tipMap,
+ (acc, hasTip, wellName): WellGroup =>
+ hasTip ? acc : { ...acc, [wellName]: null },
+ {}
+ )
+ )
+ const missingTips = missingTipsByLabwareId
+ ? missingTipsByLabwareId[labwareId]
+ : null
+
+ return missingTips
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getModuleInnerProps.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getModuleInnerProps.ts
new file mode 100644
index 00000000000..875e87f73a3
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getModuleInnerProps.ts
@@ -0,0 +1,33 @@
+import { THERMOCYCLER_MODULE_TYPE } from '@opentrons/shared-data'
+
+import type { ComponentProps } from 'react'
+import type { Module } from '@opentrons/components'
+import type { ModuleTemporalProperties } from '@opentrons/step-generation'
+
+export const getModuleInnerProps = (
+ moduleState: ModuleTemporalProperties['moduleState']
+): ComponentProps['innerProps'] => {
+ if (moduleState.type === THERMOCYCLER_MODULE_TYPE) {
+ let lidMotorState = 'unknown'
+ if (moduleState.lidOpen) {
+ lidMotorState = 'open'
+ } else if (moduleState.lidOpen === false) {
+ lidMotorState = 'closed'
+ }
+ return {
+ lidMotorState,
+ blockTargetTemp: moduleState.blockTargetTemp,
+ }
+ } else if (
+ 'targetTemperature' in moduleState &&
+ moduleState.type === 'temperatureModuleType'
+ ) {
+ return {
+ targetTemperature: moduleState.targetTemperature,
+ }
+ } else if ('targetTemp' in moduleState) {
+ return {
+ targetTemp: moduleState.targetTemp,
+ }
+ }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getNextGroupFirstCommandId.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getNextGroupFirstCommandId.ts
new file mode 100644
index 00000000000..ea216999916
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getNextGroupFirstCommandId.ts
@@ -0,0 +1,32 @@
+import type { GroupedCommands } from '/app/redux/protocol-storage'
+
+export function getNextGroupFirstCommandId(
+ groupedCommands: GroupedCommands | null,
+ currentCommandId: string
+): string | null {
+ if (groupedCommands == null) {
+ return null
+ }
+
+ const currentIndex = groupedCommands.findIndex(group => {
+ if ('subCommands' in group) {
+ return group.subCommands.some(
+ leaf => leaf.command.id === currentCommandId
+ )
+ } else {
+ return group.command.id === currentCommandId
+ }
+ })
+
+ if (currentIndex === -1 || currentIndex + 1 >= groupedCommands.length) {
+ return null // No next group
+ }
+
+ const nextGroup = groupedCommands[currentIndex + 1]
+
+ if ('subCommands' in nextGroup) {
+ return nextGroup.subCommands[0]?.command.id ?? null
+ } else {
+ return nextGroup.command.id
+ }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getPreviousGroupFirstCommandId.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getPreviousGroupFirstCommandId.ts
new file mode 100644
index 00000000000..3ba8869f754
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getPreviousGroupFirstCommandId.ts
@@ -0,0 +1,32 @@
+import type { GroupedCommands } from '/app/redux/protocol-storage'
+
+export function getPreviousGroupFirstCommandId(
+ groupedCommands: GroupedCommands | null,
+ currentCommandId: string
+): string | null {
+ if (!groupedCommands) {
+ return null
+ }
+
+ const currentIndex = groupedCommands.findIndex(group => {
+ if ('subCommands' in group) {
+ return group.subCommands.some(
+ leaf => leaf.command.id === currentCommandId
+ )
+ } else {
+ return group.command.id === currentCommandId
+ }
+ })
+
+ if (currentIndex <= 0) {
+ return null
+ }
+
+ const previousGroup = groupedCommands[currentIndex - 1]
+
+ if ('subCommands' in previousGroup) {
+ return previousGroup.subCommands[0]?.command.id ?? null
+ } else {
+ return previousGroup.command.id
+ }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getSlotIdsBlockedBySpanningForThermocycler.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getSlotIdsBlockedBySpanningForThermocycler.ts
new file mode 100644
index 00000000000..50286d5fa68
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getSlotIdsBlockedBySpanningForThermocycler.ts
@@ -0,0 +1,29 @@
+import {
+ FLEX_ROBOT_TYPE,
+ OT2_ROBOT_TYPE,
+ THERMOCYCLER_MODULE_TYPE,
+} from '@opentrons/shared-data'
+
+import type { RobotType } from '@opentrons/shared-data'
+import type {
+ DeckSlot,
+ ModuleEntities,
+ RobotState,
+} from '@opentrons/step-generation'
+
+export const getSlotIdsBlockedBySpanningForThermocycler = (
+ modules: RobotState['modules'],
+ moduleEntities: ModuleEntities,
+ robotType: RobotType
+): DeckSlot[] => {
+ const loadedThermocycler = Object.keys(modules).find(
+ id => moduleEntities[id].type === THERMOCYCLER_MODULE_TYPE
+ )
+ if (loadedThermocycler != null && robotType === FLEX_ROBOT_TYPE) {
+ return ['A1', 'B1']
+ } else if (loadedThermocycler != null && robotType === OT2_ROBOT_TYPE) {
+ return ['7', '8', '10', '11']
+ }
+
+ return []
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getSlotIsEmpty.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getSlotIsEmpty.ts
new file mode 100644
index 00000000000..d5c8d017fdc
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getSlotIsEmpty.ts
@@ -0,0 +1,22 @@
+import values from 'lodash/values'
+
+import { getSlotInLocationStack } from '@opentrons/step-generation'
+
+import type { RobotState } from '@opentrons/step-generation'
+
+export const getSlotIsEmpty = (
+ robotState: RobotState,
+ slot: string
+): boolean => {
+ const modulesInSlot = values(robotState.modules).filter(
+ moduleTemporalProperties => {
+ return slot.includes(moduleTemporalProperties.slot)
+ }
+ )
+ const labwareInSlot = values(robotState.labware).filter(
+ labwareTemporalProperties =>
+ getSlotInLocationStack(labwareTemporalProperties.stack) === slot
+ )
+
+ return modulesInSlot.length === 0 && labwareInSlot.length === 0
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getStagingAreaAddressableAreas.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getStagingAreaAddressableAreas.ts
new file mode 100644
index 00000000000..28487f3f1db
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getStagingAreaAddressableAreas.ts
@@ -0,0 +1,29 @@
+import {
+ FLEX_ROBOT_TYPE,
+ getDeckDefFromRobotType,
+ isAddressableAreaStandardSlot,
+ STAGING_AREA_RIGHT_SLOT_FIXTURE,
+} from '@opentrons/shared-data'
+
+import type { AddressableAreaName, CutoutId } from '@opentrons/shared-data'
+
+export const getStagingAreaAddressableAreas = (
+ cutoutIds: CutoutId[],
+ filterStandardSlots: boolean = true
+): AddressableAreaName[] => {
+ const deckDef = getDeckDefFromRobotType(FLEX_ROBOT_TYPE)
+ const cutoutFixtures = deckDef.cutoutFixtures
+
+ const addressableAreasRaw = cutoutIds.flatMap(cutoutId => {
+ const addressableAreasOnCutout = cutoutFixtures.find(
+ cutoutFixture => cutoutFixture.id === STAGING_AREA_RIGHT_SLOT_FIXTURE
+ )?.providesAddressableAreas[cutoutId]
+ return addressableAreasOnCutout ?? []
+ })
+ if (filterStandardSlots) {
+ return addressableAreasRaw.filter(
+ aa => !isAddressableAreaStandardSlot(aa, deckDef)
+ )
+ }
+ return addressableAreasRaw
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getThermocyclerOverlayText.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getThermocyclerOverlayText.ts
new file mode 100644
index 00000000000..f1c78f91ef1
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getThermocyclerOverlayText.ts
@@ -0,0 +1,21 @@
+import type { RunTimeCommand } from '@opentrons/shared-data'
+
+export const getThermocyclerOverlayText = (
+ commandType: RunTimeCommand['commandType']
+): string => {
+ switch (commandType) {
+ case 'loadModule':
+ return 'Load Thermocycler'
+ case 'thermocycler/openLid':
+ return 'Opening lid'
+ case 'thermocycler/closeLid':
+ return 'Closing lid'
+ case 'thermocycler/setTargetBlockTemperature':
+ return 'Setting block temperature'
+ case 'thermocycler/waitForLidTemperature':
+ return 'Setting lid temperature'
+ default:
+ // TODO: the rest of the copy isn't needed for protocol viz user testing purposes
+ return 'Changing thermocycler state'
+ }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getTipSvgInfo.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getTipSvgInfo.ts
new file mode 100644
index 00000000000..3ec6e165eeb
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getTipSvgInfo.ts
@@ -0,0 +1,28 @@
+import { COLORS } from '@opentrons/components'
+
+import type { Liquid } from '@opentrons/shared-data'
+import type { LocationLiquidState } from '@opentrons/step-generation'
+
+interface TipSvgInfo {
+ tipColor: string
+ tipCurrentVolume: number
+}
+
+export const getTipSvgInfo = (
+ pipetteLocationLiquidState: LocationLiquidState,
+ liquids: Liquid[]
+): TipSvgInfo => {
+ const ingredIds = Object.keys(pipetteLocationLiquidState)
+ const colorsInTip = liquids.reduce(
+ (acc, { id, displayColor }) =>
+ ingredIds.includes(id) && displayColor ? [...acc, displayColor] : acc,
+ []
+ )
+ const tipColor =
+ colorsInTip.length > 1 ? COLORS.grey40 : (colorsInTip[0] ?? COLORS.grey40)
+ const tipCurrentVolume = Object.values(pipetteLocationLiquidState).reduce(
+ (sum, { volume }) => sum + volume,
+ 0
+ )
+ return { tipColor, tipCurrentVolume }
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getTopmostLabwareOnModuleFromStack.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getTopmostLabwareOnModuleFromStack.ts
new file mode 100644
index 00000000000..f472154d421
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getTopmostLabwareOnModuleFromStack.ts
@@ -0,0 +1,10 @@
+import type { LabwareTemporalProperties } from '@opentrons/step-generation'
+
+export const getTopmostLabwareOnModuleFromStack = (
+ moduleId: string,
+ labware: LabwareTemporalProperties[]
+): string => {
+ return labware
+ .filter(lw => lw.stack.includes(moduleId)) // all stacks involving this module
+ .sort((a, b) => b.stack.length - a.stack.length)[0]?.stack[0] // return topmost labware from largest stack
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/utils/getWellVolume.ts b/app/src/organisms/Desktop/ProtocolVisualization/utils/getWellVolume.ts
new file mode 100644
index 00000000000..b661cf6ca61
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/utils/getWellVolume.ts
@@ -0,0 +1,11 @@
+import { AIR } from '@opentrons/step-generation'
+
+import type { LocationLiquidState } from '@opentrons/step-generation'
+
+export const getWellVolume = (
+ labwareLocationLiquidState: LocationLiquidState
+): number =>
+ Object.entries(labwareLocationLiquidState).reduce(
+ (sum, [id, volume]) => (id !== AIR ? sum + volume.volume : sum),
+ 0
+ )
diff --git a/app/src/organisms/Desktop/RunProgressMeter/__tests__/RunProgressMeter.test.tsx b/app/src/organisms/Desktop/RunProgressMeter/__tests__/RunProgressMeter.test.tsx
index 2c0e9d3c3ee..216dde2a764 100644
--- a/app/src/organisms/Desktop/RunProgressMeter/__tests__/RunProgressMeter.test.tsx
+++ b/app/src/organisms/Desktop/RunProgressMeter/__tests__/RunProgressMeter.test.tsx
@@ -23,11 +23,11 @@ import { useRunControls } from '/app/organisms/RunTimeControl'
import { useModuleCommandAnalytics } from '/app/redux-resources/analytics/'
import { useRunningStepCounts } from '/app/resources/protocols/hooks'
import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
useLastRunCommand,
useMostRecentCompletedAnalysis,
useNotifyAllCommandsQuery,
useNotifyRunQuery,
- useRunStatus,
} from '/app/resources/runs'
import { RunProgressMeter } from '..'
@@ -74,7 +74,6 @@ describe('RunProgressMeter', () => {
vi.mocked(InterventionModal).mockReturnValue(
= {
title: 'ODD/Organisms/DeckFixtureSetupInstructionsModal',
- argTypes: {
- modalSize: {
- options: ['small', 'medium', 'large'],
- control: { type: 'radio' },
- },
- onOutsideClick: { action: 'clicked' },
- },
+ component: DeckFixtureSetupInstructionsModalComponent,
parameters: VIEWPORT.touchScreenViewport,
-} as Meta
+}
+
+export default meta
-const Template: Story<
- React.ComponentProps
-> = args =>
+
+export const Default: Story = {
+ args: {
+ setShowSetupInstructionsModal: () => {},
+ isOnDevice: true,
+ },
}
diff --git a/app/src/organisms/ErrorRecoveryFlows/RecoveryTakeover.tsx b/app/src/organisms/ErrorRecoveryFlows/RecoveryTakeover.tsx
index 3bdbd2bcd34..6b9db3fae1b 100644
--- a/app/src/organisms/ErrorRecoveryFlows/RecoveryTakeover.tsx
+++ b/app/src/organisms/ErrorRecoveryFlows/RecoveryTakeover.tsx
@@ -1,11 +1,6 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
-import {
- RUN_STATUS_AWAITING_RECOVERY,
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
-} from '@opentrons/api-client'
import {
AlertPrimaryButton,
COLORS,
@@ -15,6 +10,7 @@ import {
StyledText,
} from '@opentrons/components'
+import { isRecoveryStatus } from '/app/local-resources/runs/utils'
import { TakeoverModal } from '/app/organisms/TakeoverModal/TakeoverModal'
import { useUpdateClientDataRecovery } from '/app/resources/client_data'
@@ -43,11 +39,7 @@ export function RecoveryTakeover(props: {
// TODO(jh, 07-29-24): This is likely sufficient for most edge cases, but this does not account for
// all terminal commands as it should. Revisit this.
- const isTerminateDisabled = !(
- runStatus === RUN_STATUS_AWAITING_RECOVERY ||
- runStatus === RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR ||
- runStatus === RUN_STATUS_AWAITING_RECOVERY_PAUSED
- )
+ const isTerminateDisabled = !isRecoveryStatus(runStatus)
const buildRecoveryTakeoverProps = (
intent: ClientDataRecovery['intent']
diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useCurrentlyRecoveringFrom.ts b/app/src/organisms/ErrorRecoveryFlows/hooks/useCurrentlyRecoveringFrom.ts
index 80368f21551..c1f01ba5da7 100644
--- a/app/src/organisms/ErrorRecoveryFlows/hooks/useCurrentlyRecoveringFrom.ts
+++ b/app/src/organisms/ErrorRecoveryFlows/hooks/useCurrentlyRecoveringFrom.ts
@@ -1,13 +1,9 @@
import { useEffect, useState } from 'react'
import { useQueryClient } from 'react-query'
-import {
- RUN_STATUS_AWAITING_RECOVERY,
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
-} from '@opentrons/api-client'
import { useCommandQuery, useHost } from '@opentrons/react-api-client'
+import { isRecoveryStatus } from '/app/local-resources/runs/utils'
import { useNotifyAllCommandsQuery } from '/app/resources/runs'
import type { RunStatus } from '@opentrons/api-client'
@@ -15,13 +11,6 @@ import type { FailedCommand } from '../types'
const ALL_COMMANDS_POLL_MS = 5000
-// TODO(jh, 08-06-24): See EXEC-656.
-const VALID_RECOVERY_FETCH_STATUSES = [
- RUN_STATUS_AWAITING_RECOVERY,
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
-] as Array
-
// Return the `currentlyRecoveringFrom` command returned by the server, if any.
// The command will only be returned after the initial fetches are complete to prevent rendering of stale data.
export function useCurrentlyRecoveringFrom(
@@ -34,7 +23,7 @@ export function useCurrentlyRecoveringFrom(
// There can only be a currentlyRecoveringFrom command when the run is in recovery mode.
// In case we're falling back to polling, only enable queries when that is the case.
- const isRunInRecoveryMode = VALID_RECOVERY_FETCH_STATUSES.includes(runStatus)
+ const isRunInRecoveryMode = isRecoveryStatus(runStatus)
// Prevent stale data on subsequent recoveries by clearing the query cache at the start of each recovery.
useEffect(() => {
diff --git a/app/src/organisms/ErrorRecoveryFlows/hooks/useShowDoorInfo.ts b/app/src/organisms/ErrorRecoveryFlows/hooks/useShowDoorInfo.ts
index 43d3b141c8d..cb5a79832d7 100644
--- a/app/src/organisms/ErrorRecoveryFlows/hooks/useShowDoorInfo.ts
+++ b/app/src/organisms/ErrorRecoveryFlows/hooks/useShowDoorInfo.ts
@@ -1,19 +1,10 @@
-import {
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
-} from '@opentrons/api-client'
+import { isDoorOpenStatus } from '/app/local-resources/runs/utils'
import { GRIPPER_MOVE_STEPS, RECOVERY_MAP_METADATA } from '../constants'
-import type { RunStatus } from '@opentrons/api-client'
import type { ErrorRecoveryFlowsProps } from '../index'
import type { IRecoveryMap, RouteStep } from '../types'
-const DOOR_OPEN_STATUSES: RunStatus[] = [
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
-]
-
export interface UseShowDoorInfoResult {
/* Whether the door actually open, regardless of whether a door open event is prohibited . */
isDoorOpen: boolean
@@ -30,7 +21,7 @@ export function useShowDoorInfo(
// TODO(jh, 07-16-24): "recovery paused" is only used for door status and therefore
// a valid way to ensure all apps show the door open prompt, however this could be problematic in the future.
// Consider restructuring this check once the takeover modals are added.
- const isDoorOpen = runStatus != null && DOOR_OPEN_STATUSES.includes(runStatus)
+ const isDoorOpen = isDoorOpenStatus(runStatus)
const isProhibitedDoorOpen =
isDoorOpen &&
!isDoorPermittedOpen(recoveryMap) &&
diff --git a/app/src/organisms/ErrorRecoveryFlows/index.tsx b/app/src/organisms/ErrorRecoveryFlows/index.tsx
index c042c3cb9ac..d718f67e54c 100644
--- a/app/src/organisms/ErrorRecoveryFlows/index.tsx
+++ b/app/src/organisms/ErrorRecoveryFlows/index.tsx
@@ -1,23 +1,14 @@
import { useLayoutEffect, useState } from 'react'
import { useSelector } from 'react-redux'
-import {
- RUN_STATUS_AWAITING_RECOVERY,
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
- RUN_STATUS_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_FAILED,
- RUN_STATUS_FINISHING,
- RUN_STATUS_IDLE,
- RUN_STATUS_PAUSED,
- RUN_STATUS_RUNNING,
- RUN_STATUS_STOP_REQUESTED,
- RUN_STATUS_STOPPED,
- RUN_STATUS_SUCCEEDED,
-} from '@opentrons/api-client'
+import { RUN_STATUS_STOP_REQUESTED } from '@opentrons/api-client'
import { useHost } from '@opentrons/react-api-client'
import { OT2_ROBOT_TYPE } from '@opentrons/shared-data'
+import {
+ isInvalidERRunStatus,
+ isValidERRunStatus,
+} from '/app/local-resources/runs/utils'
import { getIsOnDevice } from '/app/redux/config'
import { useRunLoadedLabwareDefinitionsByUri } from '/app/resources/runs'
@@ -36,25 +27,6 @@ import type { CompletedProtocolAnalysis } from '@opentrons/shared-data'
import type { RunLoadedLabwareDefinitionsByUri } from '/app/resources/runs'
import type { FailedCommand } from './types'
-const VALID_ER_RUN_STATUSES: RunStatus[] = [
- RUN_STATUS_AWAITING_RECOVERY,
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
- RUN_STATUS_STOP_REQUESTED,
-]
-
-// Effectively statuses that are not an "awaiting-recovery" status OR "stop requested."
-const INVALID_ER_RUN_STATUSES: RunStatus[] = [
- RUN_STATUS_RUNNING,
- RUN_STATUS_PAUSED,
- RUN_STATUS_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_FINISHING,
- RUN_STATUS_STOPPED,
- RUN_STATUS_FAILED,
- RUN_STATUS_SUCCEEDED,
- RUN_STATUS_IDLE,
-]
-
interface UseErrorRecoveryResultBase {
isERActive: boolean
failedCommand: FailedCommand | null
@@ -89,26 +61,19 @@ export function useErrorRecoveryFlows(
status: RunStatus | null,
hasSeenAwaitingRecovery: boolean
): boolean => {
- return (
- status !== null &&
- (status === RUN_STATUS_AWAITING_RECOVERY ||
- (VALID_ER_RUN_STATUSES.includes(status) && hasSeenAwaitingRecovery))
- )
+ return isValidERRunStatus(status) && hasSeenAwaitingRecovery
}
// If client accesses a valid ER runs status besides AWAITING_RECOVERY but accesses it outside of Error Recovery flows,
// don't show ER.
useLayoutEffect(() => {
- if (runStatus != null) {
- const isAwaitingRecovery =
- VALID_ER_RUN_STATUSES.includes(runStatus) &&
- runStatus !== RUN_STATUS_STOP_REQUESTED
-
- if (isAwaitingRecovery) {
- setIsERActive(isValidERStatus(runStatus, true))
- } else if (INVALID_ER_RUN_STATUSES.includes(runStatus)) {
- setIsERActive(isValidERStatus(runStatus, false))
- }
+ const isAwaitingRecovery =
+ isValidERRunStatus(runStatus) && runStatus !== RUN_STATUS_STOP_REQUESTED
+
+ if (isAwaitingRecovery) {
+ setIsERActive(isValidERStatus(runStatus, true))
+ } else if (isInvalidERRunStatus(runStatus)) {
+ setIsERActive(isValidERStatus(runStatus, false))
}
}, [runStatus, failedCommand])
diff --git a/app/src/organisms/InterventionModal/index.tsx b/app/src/organisms/InterventionModal/index.tsx
index a4da3375d30..d56582687e3 100644
--- a/app/src/organisms/InterventionModal/index.tsx
+++ b/app/src/organisms/InterventionModal/index.tsx
@@ -2,12 +2,6 @@ import { useTranslation } from 'react-i18next'
import { useSelector } from 'react-redux'
import { css } from 'styled-components'
-import {
- RUN_STATUS_FAILED,
- RUN_STATUS_FINISHING,
- RUN_STATUS_STOPPED,
- RUN_STATUS_SUCCEEDED,
-} from '@opentrons/api-client'
import {
ALIGN_CENTER,
ALIGN_FLEX_START,
@@ -30,6 +24,7 @@ import {
} from '@opentrons/components'
import { SmallButton } from '/app/atoms/buttons'
+import { isTerminatingRunStatus } from '/app/local-resources/runs/utils'
import { InterventionModal as InterventionModalMolecule } from '/app/molecules/InterventionModal'
import { OddModal } from '/app/molecules/OddModal'
import { useRobotType } from '/app/redux-resources/robots'
@@ -50,13 +45,6 @@ import type {
import type { IconName } from '@opentrons/components'
import type { CompletedProtocolAnalysis } from '@opentrons/shared-data'
-const TERMINAL_RUN_STATUSES: RunStatus[] = [
- RUN_STATUS_STOPPED,
- RUN_STATUS_FAILED,
- RUN_STATUS_FINISHING,
- RUN_STATUS_SUCCEEDED,
-]
-
export interface UseInterventionModalProps {
runData: RunData | null
lastRunCommand: RunCommandSummary | null
@@ -85,7 +73,7 @@ export function useInterventionModal({
isInterventionCommand(lastRunCommand) &&
runData != null &&
runStatus != null &&
- !TERMINAL_RUN_STATUSES.includes(runStatus)
+ !isTerminatingRunStatus(runStatus)
const { t } = useTranslation('run_details')
if (!isValidIntervention) {
diff --git a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/__tests__/useLPCLabwareInfo.test.ts b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/__tests__/useLPCLabwareInfo.test.ts
index f5e9c91b18c..140c1b77b6f 100644
--- a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/__tests__/useLPCLabwareInfo.test.ts
+++ b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/__tests__/useLPCLabwareInfo.test.ts
@@ -1,11 +1,12 @@
import { renderHook } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { when } from 'vitest-when'
-import { RUN_STATUS_IDLE } from '@opentrons/api-client'
+import { RUN_STATUS_IDLE, RUN_STATUS_RUNNING } from '@opentrons/api-client'
import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE } from '@opentrons/shared-data'
import { useNotifySearchLabwareOffsets } from '/app/resources/labware_offsets'
-import { useNotifyRunQuery, useRunStatus } from '/app/resources/runs'
+import { useNotifyRunQuery } from '/app/resources/runs'
import { useLPCLabwareInfo } from '..'
import { getLPCLabwareInfoFrom } from '../getLPCLabwareInfoFrom'
@@ -18,6 +19,12 @@ vi.mock('../getLPCSearchParams')
vi.mock('/app/resources/labware_offsets')
vi.mock('/app/resources/runs')
+const runningRun = {
+ current: false,
+ id: 'test_id_running',
+ status: RUN_STATUS_RUNNING,
+}
+
describe('useLPCLabwareInfo', () => {
const RUN_ID = 'run-123'
const PROTOCOL_DATA = { commands: [] } as any
@@ -35,12 +42,13 @@ describe('useLPCLabwareInfo', () => {
vi.mocked(getLPCSearchParams).mockReturnValue(MOCK_SEARCH_PARAMS)
vi.mocked(getLPCLabwareInfoFrom).mockReturnValue(MOCK_LABWARE_INFO)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_IDLE)
vi.mocked(useNotifySearchLabwareOffsets).mockReturnValue({
data: { data: MOCK_STORED_OFFSETS },
} as any)
vi.mocked(useNotifyRunQuery).mockReturnValue({
- data: { data: { labwareOffsets: MOCK_LEGACY_OFFSETS } },
+ data: {
+ data: { labwareOffsets: MOCK_LEGACY_OFFSETS, status: RUN_STATUS_IDLE },
+ },
} as any)
})
@@ -60,7 +68,6 @@ describe('useLPCLabwareInfo', () => {
legacyOffsets: MOCK_LEGACY_OFFSETS,
})
- expect(useRunStatus).toHaveBeenCalledWith(RUN_ID)
expect(getUniqueValidLwLocationInfoByAnalysis).toHaveBeenCalledWith({
labwareDefs: LABWARE_DEFS,
protocolData: PROTOCOL_DATA,
@@ -119,14 +126,17 @@ describe('useLPCLabwareInfo', () => {
legacyOffsets: MOCK_LEGACY_OFFSETS,
})
- expect(useRunStatus).toHaveBeenCalledWith(null)
expect(useNotifyRunQuery).toHaveBeenCalledWith(null, {
enabled: false,
})
})
it('should not enable offset search if run status is not idle', () => {
- vi.mocked(useRunStatus).mockReturnValue('running' as any)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith('test_id_running')
+ .thenReturn({
+ data: { data: { status: runningRun } },
+ } as any)
const { result } = renderHook(() => {
return useLPCLabwareInfo({
diff --git a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/index.ts b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/index.ts
index 4abd29f56b1..5480563acb3 100644
--- a/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/index.ts
+++ b/app/src/organisms/LabwarePositionCheck/LPCFlows/hooks/useLPCLabwareInfo/index.ts
@@ -4,7 +4,10 @@ import { RUN_STATUS_IDLE } from '@opentrons/api-client'
import { FLEX_ROBOT_TYPE, OT2_ROBOT_TYPE } from '@opentrons/shared-data'
import { useNotifySearchLabwareOffsets } from '/app/resources/labware_offsets'
-import { useNotifyRunQuery, useRunStatus } from '/app/resources/runs'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useNotifyRunQuery,
+} from '/app/resources/runs'
import { getLPCLabwareInfoFrom } from './getLPCLabwareInfoFrom'
import { getLPCSearchParams } from './getLPCSearchParams'
@@ -50,7 +53,10 @@ function useFlexLPCLabwareInfo({
UseLPCLabwareInfoResult,
'labwareInfo' | 'storedOffsets'
> {
- const runStatus = useRunStatus(runId ?? null)
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
const lwLocationCombos = useMemo(
() =>
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/CameraControlsHome.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/CameraControlsHome.tsx
index 887d06a5495..aa0574abbf2 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/CameraControlsHome.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/CameraControlsHome.tsx
@@ -4,6 +4,7 @@ import { useTranslation } from 'react-i18next'
import { Icon, ListButton, StyledText } from '@opentrons/components'
import { MediumButton } from '/app/atoms/buttons'
+import { zoomNumberToString } from '/app/local-resources/images/utils/cameraUtils'
// eslint-disable-next-line opentrons/no-imports-across-applications -- For active dev only
import { usePreviewImage } from '/app/organisms/Desktop/Camera/CameraControls/PreviewSettings/hooks/usePreviewImage'
import { ChildNavigation } from '/app/organisms/ODD/ChildNavigation'
@@ -12,13 +13,13 @@ import styles from '../preferences.module.css'
import { ImagePreviewModal } from './ImagePreviewModal'
// eslint-disable-next-line opentrons/no-imports-across-applications -- For active dev only
-import type { UseStubCameraSettingsValuesResult } from '/app/organisms/Desktop/Camera/CameraControls/hooks/useStubCameraSettingsValues'
+import type { UseCameraSettingsValuesResult } from '/app/local-resources/images/hooks/useCameraSettingsValues'
import type { ActiveControlView } from '.'
export interface CameraControlsHomeProps {
setActiveSubView: (view: ActiveControlView) => void
toggleShowControls: () => void
- settings: UseStubCameraSettingsValuesResult
+ settings: UseCameraSettingsValuesResult
}
export function CameraControlsHome({
@@ -42,7 +43,8 @@ export function CameraControlsHome({
}
const buildZoomText = (): string => {
- switch (settings.zoom) {
+ const zoomString = zoomNumberToString(settings.zoom)
+ switch (zoomString) {
case '1x':
return t('default_zoom')
case '1.5x':
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/CameraTileSetting.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/CameraTileSetting.tsx
index 1d3069fa062..30158ab7046 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/CameraTileSetting.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/CameraTileSetting.tsx
@@ -19,6 +19,7 @@ export interface CameraTileSettingProps {
adjustValue: (value: number) => void
title: string
subtext: string
+ isLoading: boolean
returnToHomeView: () => void
}
@@ -28,6 +29,7 @@ export function CameraTileSetting({
value,
subtext,
adjustValue,
+ isLoading,
}: CameraTileSettingProps): JSX.Element {
const adjustedValue = roundValueToValidPercentage(value)
@@ -42,7 +44,11 @@ export function CameraTileSetting({
return (
+
+
+
+ {blockTargetTemp != null
+ ? t('temperature', { temp: blockTargetTemp })
+ : t('deactivated')}
+
+
+
+
+ {lidTargetTemp != null
+ ? t('temperature', { temp: lidTargetTemp })
+ : t('deactivated')}
+
+
+
+
+
+ )
+ break
+ }
+ case HEATERSHAKER_MODULE_TYPE: {
+ const { targetSpeed, targetTemp, latchOpen } = moduleState
+ moduleDetails = (
+
+
+ {t('deck_view')}
+
+
+ {t('step', { number: selectedCommandIndex })}
+
+
+
+
+
+ {targetTemp != null
+ ? t('temperature', { temp: targetTemp })
+ : t('deactivated')}
+
+
+
+
+ {targetSpeed != null
+ ? t('speed', { speed: targetSpeed })
+ : t('idle')}
+
+
+
+
+
+ )
+ break
+ }
+ case MAGNETIC_MODULE_TYPE: {
+ const { engaged } = moduleState
+ moduleDetails = (
+
+
+
+
+ )
+ break
+ }
+ case TEMPERATURE_MODULE_TYPE: {
+ const { status, targetTemperature } = moduleState
+ moduleDetails = (
+
+
+
+ {targetTemperature != null
+ ? t('temperature', { temp: targetTemperature })
+ : t('deactivated')}
+
+
+
+ )
+ break
+ }
+ case ABSORBANCE_READER_TYPE: {
+ const { lidOpen, initialization } = moduleState
+ moduleDetails = (
+
+
+
+ {initialization != null ? (
+ <>
+
+ )
+ break
+ }
+ case FLEX_STACKER_MODULE_TYPE: {
+ // TODO: add this in when the flex stacker module state is finalized for PD
+ // const {
+ // maxPoolCount,
+ // storedLabwareDetails,
+ // labwareInHopper,
+ // labwareOnShuttle,
+ // } = moduleState
+ console.error(
+ "TODO: update this when PD's flex stacker module state is finalized"
+ )
+ break
+ }
+ case MAGNETIC_BLOCK_TYPE: {
+ // no state to show
+ break
+ }
+ default:
+ console.error(
+ `ran into the default moduleContainer moduleState with module ${moduleDisplayName}`
+ )
+ }
+
+ return (
+
+
+ {t('initialization')}
+
+
+ {initialization.mode}
+
+
+
+
+ {t('wavelengths')}
+
+
+ {initialization.wavelengths}
+
+
+ {initialization.referenceWavelength != null ? (
+
+
+ {t('reference_wavelength')}
+
+
+ {initialization.referenceWavelength}
+
+
+ ) : null}
+
+ ) : null}
+
+
+ )
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/ModuleStatusContainer.tsx b/app/src/organisms/Desktop/ProtocolVisualization/ModuleStatusContainer.tsx
new file mode 100644
index 00000000000..6896a995759
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/ModuleStatusContainer.tsx
@@ -0,0 +1,22 @@
+import { useTranslation } from 'react-i18next'
+
+import { StyledText } from '@opentrons/components'
+
+import styles from './modulecontainer.module.css'
+
+interface ModuleStatusContainerProps {
+ title: string
+ children: React.ReactNode
+}
+export const ModuleStatusContainer = (
+ props: ModuleStatusContainerProps
+): JSX.Element => {
+ const { t } = useTranslation('protocol_visualization')
+ const { title, children } = props
+ return (
+
+
+ {moduleDisplayName}
+
+ {moduleDetails}
+
+
+ {t(title)}
+ {children}
+
+ )
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/SlotDetails/index.tsx b/app/src/organisms/Desktop/ProtocolVisualization/SlotDetails/index.tsx
new file mode 100644
index 00000000000..8fc017e929e
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/SlotDetails/index.tsx
@@ -0,0 +1,126 @@
+import { useTranslation } from 'react-i18next'
+
+import {
+ Divider,
+ MODULE_ICON_NAME_BY_TYPE,
+ RobotInfoLabel,
+} from '@opentrons/components'
+import { getIsTiprack } from '@opentrons/shared-data'
+import { getFullStackFromLabwares } from '@opentrons/step-generation'
+
+import { SlotDetailsEmptyState } from '/app/molecules/SlotDetailsEmptyState'
+
+import { LabwareSlotContainer } from '../LabwareSlotContainer'
+import { ModuleContainer } from '../ModuleContainer'
+import { TipDisposalContainer } from '../TipDisposalContainer'
+import { TipPickupContainer } from '../TipPickupContainer'
+import styles from './slotdetails.module.css'
+
+import type {
+ Liquid,
+ ProtocolAnalysisOutput,
+ RunTimeCommand,
+} from '@opentrons/shared-data'
+import type { InvariantContext, RobotState } from '@opentrons/step-generation'
+
+interface SlotDetailsProps {
+ slotId: string
+ command: RunTimeCommand
+ robotState: RobotState
+ invariantContext: InvariantContext
+ analysis: ProtocolAnalysisOutput
+ liquids: Liquid[]
+}
+export function SlotDetails(props: SlotDetailsProps): JSX.Element {
+ const { slotId, command, robotState, invariantContext, analysis, liquids } =
+ props
+ const { labware, modules } = robotState
+ const {
+ labwareEntities,
+ trashBinEntities,
+ wasteChuteEntities,
+ moduleEntities,
+ pipetteEntities,
+ } = invariantContext
+ const { commands } = analysis
+ const { t } = useTranslation('protocol_visualization')
+ const stackOfLabwareOnSlot = getFullStackFromLabwares(labware, slotId)
+ const moduleOnSlot = Object.entries(modules).find(
+ ([id, module]) => module.slot === slotId
+ )
+ const topMostLabwareOnSlot =
+ stackOfLabwareOnSlot?.length > 1 ? stackOfLabwareOnSlot[0] : null
+ const isTopmostLabwareATiprack =
+ topMostLabwareOnSlot != null &&
+ getIsTiprack(labwareEntities[topMostLabwareOnSlot].def)
+ const isTrashOnSlot =
+ Object.values(trashBinEntities).some(
+ trash => trash.location.split('cutout')[1] === slotId
+ ) ||
+ Object.values(wasteChuteEntities).some(
+ trash => trash.location.split('cutout')[1] === slotId
+ ) ||
+ slotId === 'fixedTrash'
+
+ const isSlotEmpty =
+ moduleOnSlot == null && topMostLabwareOnSlot == null && !isTrashOnSlot
+
+ return (
+ <>
+ {isSlotEmpty ? (
+
+
+ ) : null}
+
+
+
+ )
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/SlotDetails/slotdetails.module.css b/app/src/organisms/Desktop/ProtocolVisualization/SlotDetails/slotdetails.module.css
new file mode 100644
index 00000000000..35588fab9b7
--- /dev/null
+++ b/app/src/organisms/Desktop/ProtocolVisualization/SlotDetails/slotdetails.module.css
@@ -0,0 +1,40 @@
+.slot_detail_container {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ align-items: center;
+ justify-content: center;
+ padding: var(--spacing-16) var(--spacing-20);
+ background-color: var(--white);
+}
+
+.slot_container {
+ display: flex;
+ width: 100%;
+ height: 100%;
+ flex-direction: column;
+ gap: var(--spacing-8);
+}
+
+.slot_details {
+ height: 100%;
+ border-radius: var(--border-radius-8);
+ background-color: var(--white);
+ overflow-y: auto;
+}
+
+.slot_details::-webkit-scrollbar {
+ display: none;
+}
+
+.command_step_header {
+ display: flex;
+ justify-content: space-between;
+ padding: var(--spacing-16);
+}
+
+.slot_detail_header {
+ display: flex;
+ align-items: center;
+ gap: var(--spacing-4);
+}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/StepDetailContainer.tsx b/app/src/organisms/Desktop/ProtocolVisualization/StepDetailContainer.tsx
index 485ec81f843..32d3b2c0afb 100644
--- a/app/src/organisms/Desktop/ProtocolVisualization/StepDetailContainer.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/StepDetailContainer.tsx
@@ -6,11 +6,9 @@ import { PipetteContainer } from './PipetteContainer'
import styles from './stepdetailcontainer.module.css'
import { TipDisposalContainer } from './TipDisposalContainer'
import { TipPickupContainer } from './TipPickupContainer'
-import {
- getActiveSlotForLabwareDetails,
- getActiveSlotForTiprackDetails,
- getIsPipetteActive,
-} from './utils'
+import { getActiveSlotForLabwareDetails } from './utils/getActiveSlotForLabwareDetails'
+import { getActiveSlotForTiprackDetails } from './utils/getActiveSlotForTiprackDetails'
+import { getIsPipetteActive } from './utils/getIsPipetteActive'
import type { Liquid, RunTimeCommand } from '@opentrons/shared-data'
import type { InvariantContext, RobotState } from '@opentrons/step-generation'
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/TipDisposalContainer.tsx b/app/src/organisms/Desktop/ProtocolVisualization/TipDisposalContainer.tsx
index 045bed58d43..620f55b5667 100644
--- a/app/src/organisms/Desktop/ProtocolVisualization/TipDisposalContainer.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/TipDisposalContainer.tsx
@@ -33,10 +33,10 @@ export function TipDisposalContainer({
+
+
+
+
+
+
-
+
{t('tips_in_trash')}
-
+
{t('remaining_tips', { remaining: totalEmptyTips })}
diff --git a/app/src/organisms/Desktop/ProtocolVisualization/TipPickupContainer.tsx b/app/src/organisms/Desktop/ProtocolVisualization/TipPickupContainer.tsx
index a4014dcd9be..da6a7b9064a 100644
--- a/app/src/organisms/Desktop/ProtocolVisualization/TipPickupContainer.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/TipPickupContainer.tsx
@@ -14,7 +14,7 @@ import { getLabwareViewBox } from '@opentrons/shared-data'
import { getSlotInLocationStack } from '@opentrons/step-generation'
import styles from './tippickupcontainer.module.css'
-import { getMissingTips } from './utils'
+import { getMissingTips } from './utils/getMissingTips'
import type { TipType } from '@opentrons/components'
import type { LabwareEntity, RobotState } from '@opentrons/step-generation'
@@ -52,7 +52,7 @@ export function TipPickupContainer(
return (
-
@@ -78,10 +78,10 @@ export function TipPickupContainer(
-
+
{t('tips_remaining')}
-
+
{t('remaining_tips', { remaining: tipsRemaining })}
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/__tests__/VisualizerContainer.test.tsx b/app/src/organisms/Desktop/ProtocolVisualization/VisualizerContainer/__tests__/VisualizerContainer.test.tsx
similarity index 85%
rename from app/src/pages/Desktop/Protocols/ProtocolVisualization/__tests__/VisualizerContainer.test.tsx
rename to app/src/organisms/Desktop/ProtocolVisualization/VisualizerContainer/__tests__/VisualizerContainer.test.tsx
index faed039bec2..b5ec7b94ffe 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/__tests__/VisualizerContainer.test.tsx
+++ b/app/src/organisms/Desktop/ProtocolVisualization/VisualizerContainer/__tests__/VisualizerContainer.test.tsx
@@ -2,19 +2,19 @@ import { screen } from '@testing-library/react'
import { beforeEach, describe, it, vi } from 'vitest'
import { renderWithProviders } from '/app/__testing-utils__'
+import { CommandSteps } from '/app/organisms/Desktop/ProtocolVisualization/CommandSteps'
import { Controls } from '/app/organisms/Desktop/ProtocolVisualization/Controls'
+import { DeckView } from '/app/organisms/Desktop/ProtocolVisualization/DeckView'
import { StepDetailContainer } from '/app/organisms/Desktop/ProtocolVisualization/StepDetailContainer'
-import { CommandSteps } from '../CommandSteps'
-import { DeckView } from '../DeckView'
-import { VisualizerContainer } from '../VisualizerContainer'
+import { VisualizerContainer } from '../../../../../organisms/Desktop/ProtocolVisualization/VisualizerContainer'
import type { ComponentProps } from 'react'
vi.mock('/app/organisms/Desktop/ProtocolVisualization/Controls')
vi.mock('/app/organisms/Desktop/ProtocolVisualization/StepDetailContainer')
-vi.mock('../CommandSteps')
-vi.mock('../DeckView')
+vi.mock('/app/organisms/Desktop/ProtocolVisualization/CommandSteps')
+vi.mock('/app/organisms/Desktop/ProtocolVisualization/DeckView')
const render = (props: ComponentPropsMOCK_INTERVENTION_MODAL
)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_RUNNING)
when(useMostRecentCompletedAnalysis)
.calledWith(NON_DETERMINISTIC_RUN_ID)
.thenReturn(null)
@@ -94,7 +93,18 @@ describe('RunProgressMeter', () => {
.calledWith(NON_DETERMINISTIC_RUN_ID, { refetchInterval: 1000 })
.thenReturn({ key: NON_DETERMINISTIC_COMMAND_KEY } as RunCommandSummary)
- vi.mocked(useNotifyRunQuery).mockReturnValue({ data: null } as any)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(NON_DETERMINISTIC_RUN_ID, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({
+ data: {
+ data: {
+ id: NON_DETERMINISTIC_RUN_ID,
+ status: RUN_STATUS_RUNNING,
+ },
+ },
+ } as any)
vi.mocked(useRunningStepCounts).mockReturnValue({
totalStepCount: null,
currentStepNumber: null,
@@ -125,14 +135,25 @@ describe('RunProgressMeter', () => {
it('should give no step info when run status is idle', () => {
vi.mocked(useCommandQuery).mockReturnValue({ data: null } as any)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_IDLE)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(NON_DETERMINISTIC_RUN_ID, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({
+ data: {
+ data: {
+ id: NON_DETERMINISTIC_RUN_ID,
+ status: RUN_STATUS_IDLE,
+ },
+ },
+ } as any)
+
render(props)
expect(screen.queryByText(/Step/)).toBeNull()
})
it('should render an intervention modal when showInterventionModal is true', () => {
vi.mocked(useCommandQuery).mockReturnValue({ data: null } as any)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_IDLE)
vi.mocked(useInterventionModal).mockReturnValue({
showModal: true,
modalProps: {} as any,
@@ -145,7 +166,19 @@ describe('RunProgressMeter', () => {
it('should render no text when run status is completed', () => {
vi.mocked(useCommandQuery).mockReturnValue({ data: null } as any)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_SUCCEEDED)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(NON_DETERMINISTIC_RUN_ID, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({
+ data: {
+ data: {
+ id: NON_DETERMINISTIC_RUN_ID,
+ status: RUN_STATUS_SUCCEEDED,
+ },
+ },
+ } as any)
+
vi.mocked(useRunningStepCounts).mockReturnValue({
totalStepCount: 10,
currentStepNumber: 10,
@@ -157,7 +190,18 @@ describe('RunProgressMeter', () => {
it('should render no text when the run is cancelled before running', () => {
vi.mocked(useCommandQuery).mockReturnValue({ data: null } as any)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_STOPPED)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(NON_DETERMINISTIC_RUN_ID, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({
+ data: {
+ data: {
+ id: NON_DETERMINISTIC_RUN_ID,
+ status: RUN_STATUS_STOPPED,
+ },
+ },
+ } as any)
render(props)
expect(screen.queryByText(/Step/)).toBeNull()
})
diff --git a/app/src/organisms/Desktop/RunProgressMeter/constants.ts b/app/src/organisms/Desktop/RunProgressMeter/constants.ts
deleted file mode 100644
index 525cb55c5d3..00000000000
--- a/app/src/organisms/Desktop/RunProgressMeter/constants.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import {
- RUN_STATUS_FAILED,
- RUN_STATUS_FINISHING,
- RUN_STATUS_STOPPED,
- RUN_STATUS_SUCCEEDED,
-} from '@opentrons/api-client'
-
-import type { RunStatus } from '@opentrons/api-client'
-
-export const TERMINAL_RUN_STATUSES: RunStatus[] = [
- RUN_STATUS_STOPPED,
- RUN_STATUS_FAILED,
- RUN_STATUS_FINISHING,
- RUN_STATUS_SUCCEEDED,
-]
diff --git a/app/src/organisms/Desktop/RunProgressMeter/hooks/useRunProgressCopy.tsx b/app/src/organisms/Desktop/RunProgressMeter/hooks/useRunProgressCopy.tsx
index 8ccc0d1a127..7fdc38cc723 100644
--- a/app/src/organisms/Desktop/RunProgressMeter/hooks/useRunProgressCopy.tsx
+++ b/app/src/organisms/Desktop/RunProgressMeter/hooks/useRunProgressCopy.tsx
@@ -1,20 +1,19 @@
import { useMemo } from 'react'
import { useTranslation } from 'react-i18next'
-import {
- RUN_STATUS_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_IDLE,
-} from '@opentrons/api-client'
+import { RUN_STATUS_IDLE } from '@opentrons/api-client'
import {
CommandText,
getCommandTextData,
getLabwareDefinitionsFromCommands,
} from '@opentrons/components'
+import {
+ isRunStatusNotStarted,
+ isTerminalRunStatus,
+} from '/app/local-resources/runs/utils'
import { useModuleCommandAnalytics } from '/app/redux-resources/analytics/'
-import { isTerminalRunStatus } from '../../Devices/ProtocolRun/ProtocolRunHeader/utils'
-
import type { ReactNode } from 'react'
import type { CommandDetail, RunStatus } from '@opentrons/api-client'
import type {
@@ -57,9 +56,7 @@ export function useRunProgressCopy({
const { t } = useTranslation('run_details')
const runHasNotBeenStarted =
- (currentStepNumber === 0 &&
- runStatus === RUN_STATUS_BLOCKED_BY_OPEN_DOOR) ||
- runStatus === RUN_STATUS_IDLE
+ currentStepNumber === 0 && isRunStatusNotStarted(runStatus)
const isValidRobotSideAnalysis = analysis != null
const allRunDefs = useMemo(
diff --git a/app/src/organisms/Desktop/RunProgressMeter/index.tsx b/app/src/organisms/Desktop/RunProgressMeter/index.tsx
index ea411164b0c..299ca5fccae 100644
--- a/app/src/organisms/Desktop/RunProgressMeter/index.tsx
+++ b/app/src/organisms/Desktop/RunProgressMeter/index.tsx
@@ -20,6 +20,7 @@ import { useCommandQuery } from '@opentrons/react-api-client'
import { getModalPortalEl } from '/app/App/portal'
import { ProgressBar } from '/app/atoms/ProgressBar'
+import { isTerminalRunStatus } from '/app/local-resources/runs/utils'
import {
InterventionModal,
useInterventionModal,
@@ -28,14 +29,13 @@ import { useRunControls } from '/app/organisms/RunTimeControl'
import { useRobotType } from '/app/redux-resources/robots'
import { useRunningStepCounts } from '/app/resources/protocols/hooks'
import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
useMostRecentCompletedAnalysis,
useNotifyAllCommandsQuery,
useNotifyRunQuery,
- useRunStatus,
} from '/app/resources/runs'
import { useDownloadRunLog } from '../Devices/hooks'
-import { isTerminalRunStatus } from '../Devices/ProtocolRun/ProtocolRunHeader/utils'
import { useRunProgressCopy } from './hooks'
import { InterventionTicks } from './InterventionTicks'
@@ -50,10 +50,12 @@ export function RunProgressMeter(props: RunProgressMeterProps): JSX.Element {
const { runId, robotName, makeHandleJumpToStep } = props
const { t } = useTranslation('run_details')
const robotType = useRobotType(robotName)
- const runStatus = useRunStatus(runId)
const { play } = useRunControls(runId)
- const { data: runRecord } = useNotifyRunQuery(runId)
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
const runData = runRecord?.data ?? null
+ const runStatus = runData?.status ?? null
const { data: mostRecentCommandData } = useNotifyAllCommandsQuery(runId, {
pageLength: 1,
diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/TouchScreenDeckFixtureSetupInstructionModal.stories.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/TouchScreenDeckFixtureSetupInstructionModal.stories.tsx
index c289adb508c..67ebd5cf632 100644
--- a/app/src/organisms/DeviceDetailsDeckConfiguration/TouchScreenDeckFixtureSetupInstructionModal.stories.tsx
+++ b/app/src/organisms/DeviceDetailsDeckConfiguration/TouchScreenDeckFixtureSetupInstructionModal.stories.tsx
@@ -1,27 +1,22 @@
import { VIEWPORT } from '@opentrons/components'
-import { DeckFixtureSetupInstructionsModal } from './DeckFixtureSetupInstructionsModal'
+import { DeckFixtureSetupInstructionsModal as DeckFixtureSetupInstructionsModalComponent } from './DeckFixtureSetupInstructionsModal'
-import type { Meta, Story } from '@storybook/react'
-import type * as React from 'react'
+import type { Meta, StoryObj } from '@storybook/react'
-export default {
+const meta: Meta
- {subtext}
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/ZoomSettingsView.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/ZoomSettingsView.tsx
index 1548c7b1076..4002f519dd1 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/ZoomSettingsView.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/ZoomSettingsView.tsx
@@ -2,36 +2,36 @@ import { useTranslation } from 'react-i18next'
import { RadioButton, StyledText } from '@opentrons/components'
+import { zoomNumberToString } from '/app/local-resources/images/utils/cameraUtils'
import { ChildNavigation } from '/app/organisms/ODD/ChildNavigation'
import styles from './cameracontrols.module.css'
// eslint-disable-next-line opentrons/no-imports-across-applications -- For active dev only
-import type { UseStubCameraSettingsValuesResult } from '/app/organisms/Desktop/Camera/CameraControls/hooks/useStubCameraSettingsValues'
+import type { UseCameraSettingsValuesResult } from '/app/local-resources/images/hooks/useCameraSettingsValues'
-const ZOOM_VALUES: Array = [
- '1x',
- '1.5x',
- '2x',
-]
+const ZOOM_VALUES: Array = [1, 1.5, 2]
export interface ZoomSettingsViewProps {
- zoomValue: UseStubCameraSettingsValuesResult['zoom']
- adjustZoom: UseStubCameraSettingsValuesResult['adjustZoom']
+ zoomValue: UseCameraSettingsValuesResult['zoom']
+ adjustZoom: UseCameraSettingsValuesResult['adjustZoom']
returnToHomeView: () => void
+ isLoading: boolean
}
export function ZoomSettingsView({
zoomValue,
adjustZoom,
returnToHomeView,
+ isLoading,
}: ZoomSettingsViewProps): JSX.Element {
const { t } = useTranslation('device_settings')
const buildSubLabel = (
- value: UseStubCameraSettingsValuesResult['zoom']
+ value: UseCameraSettingsValuesResult['zoom']
): string => {
- switch (value) {
+ const zoomString = zoomNumberToString(value)
+ switch (zoomString) {
case '1x':
return t('default')
case '1.5x':
@@ -43,26 +43,31 @@ export function ZoomSettingsView({
return (
-
{t('adjust_deck_appearance')}
{ZOOM_VALUES.map(val => {
+ const zoomString = zoomNumberToString(val)
return (
{
- adjustZoom(val)
+ adjustZoom(zoomString)
}}
/>
)
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControls.test.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControls.test.tsx
index e1452033b02..c16b9332979 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControls.test.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControls.test.tsx
@@ -4,7 +4,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'
import { renderWithProviders } from '/app/__testing-utils__'
import { i18n } from '/app/i18n'
// eslint-disable-next-line opentrons/no-imports-across-applications -- For active dev only
-import { useStubCameraSettingsValues } from '/app/organisms/Desktop/Camera/CameraControls/hooks/useStubCameraSettingsValues'
+import { useCameraSettingsValues } from '/app/local-resources/images/hooks/useCameraSettingsValues'
import { CameraControls } from '..'
import { CameraControlsHome } from '../CameraControlsHome'
@@ -13,9 +13,7 @@ import { ZoomSettingsView } from '../ZoomSettingsView'
import type { CameraControlsProps } from '..'
-vi.mock(
- '/app/organisms/Desktop/Camera/CameraControls/hooks/useStubCameraSettingsValues'
-)
+vi.mock('/app/local-resources/images/hooks/useCameraSettingsValues')
vi.mock('../CameraControlsHome')
vi.mock('../CameraTileSetting')
vi.mock('../ZoomSettingsView')
@@ -32,9 +30,10 @@ describe('CameraControls', () => {
beforeEach(() => {
mockProps = {
toggleShowControls: vi.fn(),
+ runId: 'run-id',
}
- vi.mocked(useStubCameraSettingsValues).mockReturnValue({
- zoom: '1x',
+ vi.mocked(useCameraSettingsValues).mockReturnValue({
+ zoom: 1,
brightness: 50,
contrast: 50,
saturation: 50,
@@ -80,7 +79,7 @@ describe('CameraControls', () => {
screen.getByText('MOCK_ZOOM_SETTINGS_VIEW')
expect(vi.mocked(ZoomSettingsView)).toHaveBeenCalledWith(
expect.objectContaining({
- zoomValue: '1x',
+ zoomValue: 1,
adjustZoom: expect.any(Function),
returnToHomeView: expect.any(Function),
}),
@@ -102,6 +101,7 @@ describe('CameraControls', () => {
subtext: 'Adjust the overall lightness or darkness.',
adjustValue: expect.any(Function),
returnToHomeView: expect.any(Function),
+ isLoading: false,
}),
{}
)
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControlsHome.test.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControlsHome.test.tsx
index d9f4d93a555..5cb18e94fd4 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControlsHome.test.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraControlsHome.test.tsx
@@ -11,7 +11,7 @@ import { CameraControlsHome } from '../CameraControlsHome'
import { ImagePreviewModal } from '../ImagePreviewModal'
// eslint-disable-next-line opentrons/no-imports-across-applications -- For active dev only
-import type { UseStubCameraSettingsValuesResult } from '/app/organisms/Desktop/Camera/CameraControls/hooks/useStubCameraSettingsValues'
+import type { UseCameraSettingsValuesResult } from '/app/local-resources/images/hooks/useCameraSettingsValues'
import type { CameraControlsHomeProps } from '../CameraControlsHome'
vi.mock(
@@ -28,11 +28,11 @@ const render = (props: CameraControlsHomeProps) => {
describe('CameraControlsHome', () => {
let mockProps: CameraControlsHomeProps
- let mockSettings: UseStubCameraSettingsValuesResult
+ let mockSettings: UseCameraSettingsValuesResult
beforeEach(() => {
mockSettings = {
- zoom: '1x',
+ zoom: 1,
brightness: 50,
contrast: 50,
saturation: 50,
@@ -95,7 +95,7 @@ describe('CameraControlsHome', () => {
it('renders zoom setting button with moderate zoom text', () => {
const propsWithModerateZoom = {
...mockProps,
- settings: { ...mockSettings, zoom: '1.5x' as const },
+ settings: { ...mockSettings, zoom: 1.5 },
}
render(propsWithModerateZoom)
@@ -105,7 +105,7 @@ describe('CameraControlsHome', () => {
it('renders zoom setting button with maximum zoom text', () => {
const propsWithMaxZoom = {
...mockProps,
- settings: { ...mockSettings, zoom: '2x' as const },
+ settings: { ...mockSettings, zoom: 2 },
}
render(propsWithMaxZoom)
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraTileSettings.test.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraTileSettings.test.tsx
index d700213dcc8..1d905cd418d 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraTileSettings.test.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/CameraTileSettings.test.tsx
@@ -27,6 +27,7 @@ describe('CameraTileSetting', () => {
title: 'Test Setting',
subtext: 'Test subtext description',
returnToHomeView: vi.fn(),
+ isLoading: false,
}
vi.mocked(ChildNavigation).mockReturnValue((null)
- const settings = useStubCameraSettingsValues()
+ const settings = useCameraSettingsValues()
+ const createGlobalCameraSettings = useCreateCameraImageSettings()
+ const createRunCameraSettings = useAddCameraImageSettingsToRunMutation(
+ runId || ''
+ )
+
+ const returnToHomeView = (settings: CameraImageSettings): void => {
+ setIsLoading(true)
+
+ const createCameraSettings =
+ runId != null
+ ? createRunCameraSettings.addCameraImageSettingsToRun
+ : createGlobalCameraSettings.createCameraImageSettings
- const returnToHomeView = (): void => {
- setActiveSubView(null)
+ createCameraSettings(settings, {
+ onSuccess: () => {
+ setActiveSubView(null)
+ },
+ onSettled: () => {
+ setIsLoading(false)
+ },
+ })
}
switch (activeSubView) {
@@ -37,7 +65,10 @@ export function CameraControls({
{
+ returnToHomeView({ zoom: settings.zoom })
+ }}
+ isLoading={isLoading}
/>
)
@@ -48,7 +79,10 @@ export function CameraControls({
title={t('brightness')}
subtext={t('adjust_brightness')}
adjustValue={settings.adjustBrightness}
- returnToHomeView={returnToHomeView}
+ returnToHomeView={() => {
+ returnToHomeView({ brightness: settings.brightness })
+ }}
+ isLoading={isLoading}
/>
)
@@ -59,7 +93,10 @@ export function CameraControls({
title={t('contrast')}
subtext={t('adjust_contrast')}
adjustValue={settings.adjustContrast}
- returnToHomeView={returnToHomeView}
+ returnToHomeView={() => {
+ returnToHomeView({ contrast: settings.contrast })
+ }}
+ isLoading={isLoading}
/>
)
@@ -70,7 +107,10 @@ export function CameraControls({
title={t('saturation')}
subtext={t('adjust_saturation')}
adjustValue={settings.adjustSaturation}
- returnToHomeView={returnToHomeView}
+ returnToHomeView={() => {
+ returnToHomeView({ saturation: settings.saturation })
+ }}
+ isLoading={isLoading}
/>
)
diff --git a/app/src/organisms/ODD/CameraSettings/index.tsx b/app/src/organisms/ODD/CameraSettings/index.tsx
index ec4f184d49a..d371e7970c7 100644
--- a/app/src/organisms/ODD/CameraSettings/index.tsx
+++ b/app/src/organisms/ODD/CameraSettings/index.tsx
@@ -34,6 +34,7 @@ export interface CameraSettingsProps {
not general settings context. */
storageInfo: RobotStorageInfo | null
isCameraRequired: boolean | null
+ runId: string | null
}
export function CameraSettings({
@@ -48,6 +49,7 @@ export function CameraSettings({
toggleLiveStreamEnabled,
isRecoveryCaptureEnabled,
isLiveVideoEnabled,
+ runId,
}: CameraSettingsProps): JSX.Element {
const isCameraSettingsEnabled = useFeatureFlag('camera')
const [showControls, setShowControls] = useState(false)
@@ -92,7 +94,9 @@ export function CameraSettings({
}
}
if (showControls) {
- return
MOCK_CHILD_NAVIGATION
)
})
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/ZoomSettingsView.test.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/ZoomSettingsView.test.tsx
index 2ae94a0b6a6..36dff802472 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/ZoomSettingsView.test.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/__tests__/ZoomSettingsView.test.tsx
@@ -22,9 +22,10 @@ describe('ZoomSettingsView', () => {
beforeEach(() => {
mockProps = {
- zoomValue: '1x',
+ zoomValue: 1,
adjustZoom: vi.fn(),
returnToHomeView: vi.fn(),
+ isLoading: false,
}
vi.mocked(ChildNavigation).mockReturnValue(MOCK_CHILD_NAVIGATION
)
})
diff --git a/app/src/organisms/ODD/CameraSettings/CameraControls/index.tsx b/app/src/organisms/ODD/CameraSettings/CameraControls/index.tsx
index 8494f4fb63f..7cbb02de826 100644
--- a/app/src/organisms/ODD/CameraSettings/CameraControls/index.tsx
+++ b/app/src/organisms/ODD/CameraSettings/CameraControls/index.tsx
@@ -1,13 +1,20 @@
import { useState } from 'react'
import { useTranslation } from 'react-i18next'
+import {
+ useAddCameraImageSettingsToRunMutation,
+ useCreateCameraImageSettings,
+} from '@opentrons/react-api-client'
+
// eslint-disable-next-line opentrons/no-imports-across-applications -- For active dev only
-import { useStubCameraSettingsValues } from '/app/organisms/Desktop/Camera/CameraControls/hooks/useStubCameraSettingsValues'
+import { useCameraSettingsValues } from '/app/local-resources/images/hooks/useCameraSettingsValues'
import { CameraControlsHome } from './CameraControlsHome'
import { CameraTileSetting } from './CameraTileSetting'
import { ZoomSettingsView } from './ZoomSettingsView'
+import type { CameraImageSettings } from '@opentrons/api-client'
+
export type ActiveControlView =
| 'zoom'
| 'brightness'
@@ -17,18 +24,39 @@ export type ActiveControlView =
export interface CameraControlsProps {
toggleShowControls: () => void
+ runId: string | null
}
export function CameraControls({
toggleShowControls,
+ runId,
}: CameraControlsProps): JSX.Element {
const { t } = useTranslation('device_settings')
+ const [isLoading, setIsLoading] = useState(false)
const [activeSubView, setActiveSubView] = useState
ariaDisabled?: boolean
@@ -53,6 +54,7 @@ export function ChildNavigation({
onClickButton,
buttonType = 'primary',
iconName,
+ backIconName,
iconPlacement,
secondaryButtonProps,
buttonIsDisabled,
@@ -79,7 +81,11 @@ export function ChildNavigation({
onClick={onClickBack}
data-testid="ChildNavigation_Back_Button"
>
-
diff --git a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/index.tsx b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/index.tsx
index 0091d049c1d..88bf0d8fcb1 100644
--- a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/index.tsx
+++ b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupCamera/index.tsx
@@ -122,6 +122,7 @@ export function ProtocolSetupCamera(
toggleLiveStreamEnabled={toggleLiveStreamEnabled}
toggleRecoveryEnabled={toggleRecoveryEnabled}
toggleCameraEnabled={toggleCameraEnabled}
+ runId={runId}
/>
)
}
diff --git a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/ProtocolSetupModulesAndDeck.tsx b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/ProtocolSetupModulesAndDeck.tsx
index 66fd0336c1e..f7dbd976c56 100644
--- a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/ProtocolSetupModulesAndDeck.tsx
+++ b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/ProtocolSetupModulesAndDeck.tsx
@@ -26,8 +26,9 @@ import { useNotifyDeckConfigurationQuery } from '/app/resources/deck_configurati
import { useDeckConfigurationCompatibility } from '/app/resources/deck_configuration/hooks'
import { useAttachedModules } from '/app/resources/modules'
import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
useMostRecentCompletedAnalysis,
- useRunStatus,
+ useNotifyRunQuery,
} from '/app/resources/runs'
import {
getAttachedProtocolModuleMatches,
@@ -60,7 +61,10 @@ export function ProtocolSetupModulesAndDeck({
}: ProtocolSetupModulesAndDeckProps): JSX.Element {
const { i18n, t } = useTranslation('protocol_setup')
const navigate = useNavigate()
- const runStatus = useRunStatus(runId)
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
useEffect(() => {
if (runStatus === RUN_STATUS_STOPPED) {
navigate('/protocols')
diff --git a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/__tests__/ProtocolSetupModulesAndDeck.test.tsx b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/__tests__/ProtocolSetupModulesAndDeck.test.tsx
index de048e72770..7c98c4884ed 100644
--- a/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/__tests__/ProtocolSetupModulesAndDeck.test.tsx
+++ b/app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/__tests__/ProtocolSetupModulesAndDeck.test.tsx
@@ -24,8 +24,8 @@ import { useAttachedModules } from '/app/resources/modules'
import {
useChainLiveCommands,
useMostRecentCompletedAnalysis,
+ useNotifyRunQuery,
useRunCalibrationStatus,
- useRunStatus,
} from '/app/resources/runs'
import {
getAttachedProtocolModuleMatches,
@@ -132,7 +132,9 @@ describe('ProtocolSetupModulesAndDeck', () => {
chainLiveCommands: mockChainLiveCommands,
} as any)
vi.mocked(FixtureTable).mockReturnValue((getInitialBlowoutLocation(state.blowOutDispense))
const [flowRate, setFlowRate] = useState(null)
const deckConfig = useNotifyDeckConfigurationQuery().data ?? []
- const fixtureLocationOptions = deckConfig.filter(
- cutoutConfig =>
- WASTE_CHUTE_FIXTURES.includes(cutoutConfig.cutoutFixtureId) ||
- TRASH_BIN_ADAPTER_FIXTURE === cutoutConfig.cutoutFixtureId
- )
-
- const trashBinCutoutId = fixtureLocationOptions.find(
- option => option.cutoutFixtureId === TRASH_BIN_ADAPTER_FIXTURE
- )?.cutoutId
+ const trashBinCutoutConfig = deckConfig.find(
+ cutoutConfig => cutoutConfig.cutoutFixtureId === TRASH_BIN_ADAPTER_FIXTURE
+ )
const trashBinOption: BlowOutLocation | undefined =
- trashBinCutoutId != null
+ trashBinCutoutConfig != null
? {
- cutoutId: trashBinCutoutId,
+ cutoutId: trashBinCutoutConfig.cutoutId,
cutoutFixtureId: TRASH_BIN_ADAPTER_FIXTURE,
}
: undefined
+ const wasteChuteOptions = deckConfig
+ .filter(
+ option =>
+ typeof option.cutoutFixtureId === 'string' &&
+ WASTE_CHUTE_FIXTURES.includes(option.cutoutFixtureId)
+ )
+ .map(option => ({
+ option,
+ value: `wasteChute:${option.cutoutId}`,
+ description: t('wasteChute_location', {
+ slotName: FLEX_SINGLE_SLOT_BY_CUTOUT_ID[option.cutoutId],
+ }),
+ }))
+
const blowoutLocationOptions = [
...(trashBinOption != null
? [
{
option: trashBinOption,
value: `trashBin:${trashBinOption.cutoutId}`,
- description: t('trashBin'),
+ description: t('trashBin_location', {
+ slotName: FLEX_SINGLE_SLOT_BY_CUTOUT_ID[trashBinOption.cutoutId],
+ }),
},
]
: []),
+ ...wasteChuteOptions,
{
option: SOURCE_WELL_BLOWOUT_DESTINATION,
value: SOURCE_WELL_BLOWOUT_DESTINATION,
@@ -113,11 +135,14 @@ export function DisposalVolume(props: DisposalVolumeProps): JSX.Element {
const flowRatesForSupportedTip: SupportedTip | undefined =
state.volume < 5 &&
`lowVolumeDefault` in liquidSpecs &&
+ typeof pipetteName === 'string' &&
LOW_VOLUME_PIPETTES.includes(pipetteName)
? liquidSpecs.lowVolumeDefault.supportedTips[tipType]
: liquidSpecs.default.supportedTips[tipType]
const minFlowRate = 0.1
- const maxFlowRate = Math.floor(flowRatesForSupportedTip?.uiMaxFlowRate ?? 0)
+ const maxFlowRate = Math.floor(
+ (flowRatesForSupportedTip?.uiMaxFlowRate ?? 0) as number
+ )
const flowRateError =
flowRate != null && (flowRate < minFlowRate || flowRate > maxFlowRate)
@@ -145,11 +170,17 @@ export function DisposalVolume(props: DisposalVolumeProps): JSX.Element {
return
}
+ const selectedOption = blowoutLocationOptions.find(
+ opt => opt.value === selectedBlowoutLocation
+ )
+ const blowOutLocation: BlowOutLocation =
+ selectedOption?.option ?? (selectedBlowoutLocation as BlowOutLocation)
+
dispatch({
type: ACTIONS.SET_DISPOSAL_VOLUME_DISPENSE,
disposalVolumeDispenseSettings: {
volume,
- blowOutLocation: selectedBlowoutLocation as BlowOutLocation,
+ blowOutLocation,
flowRate,
},
})
@@ -257,7 +288,8 @@ export function DisposalVolume(props: DisposalVolumeProps): JSX.Element {
key={option.value}
isSelected={selectedBlowoutLocation === option.value}
onChange={() => {
- setSelectedBlowoutLocation(option.value)
+ const value = String(option.value)
+ setSelectedBlowoutLocation(value)
}}
buttonValue={option.value}
buttonLabel={option.description}
diff --git a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/PipettePath.tsx b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/PipettePath.tsx
index 77366e54ded..8c0e6797c86 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/PipettePath.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/PipettePath.tsx
@@ -53,7 +53,7 @@ export function PipettePath(props: PipettePathProps): JSX.Element {
>(state.blowOutDispense?.location)
const [disposalVolume, setDisposalVolume] = useState(
- state?.disposalVolume
+ state?.disposalVolumeDispenseSettings?.volume
)
const maxPipetteVolume = Object.values(state.pipette.liquids)[0].maxVolume
const tipVolume = Object.values(state.tipRack.wells)[0].totalLiquidVolume
@@ -118,8 +118,6 @@ export function PipettePath(props: PipettePathProps): JSX.Element {
dispatch({
type: ACTIONS.SET_PIPETTE_PATH,
path: selectedPath as PathOption,
- disposalVolume,
- blowOutLocation,
})
trackEventWithRobotSerial({
name: ANALYTICS_QUICK_TRANSFER_SETTING_SAVED,
diff --git a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/__tests__/DisposalVolume.test.tsx b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/__tests__/DisposalVolume.test.tsx
index ddb5f455c31..2ed2d9b13ef 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/__tests__/DisposalVolume.test.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/__tests__/DisposalVolume.test.tsx
@@ -83,7 +83,7 @@ describe('DisposalVolume', () => {
await user.click(screen.getByText('Continue'))
screen.getByText('Select blowout location')
screen.getByText('Continue')
- screen.getByText('Trash bin')
+ screen.getByText('Trash bin in C3')
screen.getByText('Source well')
})
diff --git a/app/src/organisms/ODD/QuickTransferFlow/SummaryAndSettings.tsx b/app/src/organisms/ODD/QuickTransferFlow/SummaryAndSettings.tsx
index df6249db189..04c9cb29caf 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/SummaryAndSettings.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/SummaryAndSettings.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useReducer, useState } from 'react'
+import { useReducer, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { useQueryClient } from 'react-query'
import { useNavigate } from 'react-router-dom'
@@ -33,12 +33,13 @@ import { Dispense } from './Dispense'
import { Overview } from './Overview'
import { quickTransferSummaryReducer } from './reducers'
import { SaveOrRunModal } from './SaveOrRunModal'
-import { getInitialSummaryState, retrieveLiquidClassValues } from './utils'
+import { initializeSummaryState } from './utils'
import { createQuickTransferPythonFile } from './utils/createQuickTransferFile'
import type { ComponentProps } from 'react'
import type { SmallButton } from '/app/atoms/buttons'
import type { QuickTransferWizardState } from './types'
+import type { InitialSummaryStateProps } from './utils/getInitialSummaryState'
interface SummaryAndSettingsProps {
exitButtonProps: ComponentProps
@@ -65,15 +66,10 @@ export function SummaryAndSettings(
const [selectedCategory, setSelectedCategory] = useState('overview')
const deckConfig = useNotifyDeckConfigurationQuery().data ?? []
- const initialSummaryState = getInitialSummaryState({
- // @ts-expect-error TODO figure out how to make this type non-null as we know
- // none of these values will be undefined
- state: wizardFlowState,
- deckConfig,
- })
const [state, dispatch] = useReducer(
quickTransferSummaryReducer,
- initialSummaryState
+ { state: wizardFlowState as InitialSummaryStateProps['state'], deckConfig },
+ initializeSummaryState
)
const { mutateAsync: createProtocolAsync } = useCreateProtocolMutation()
@@ -90,19 +86,6 @@ export function SummaryAndSettings(
host
)
- useEffect(() => {
- if (!state.liquidClassValuesInitialized) {
- const liquidClassValues = retrieveLiquidClassValues(state, 'all')
- dispatch({
- type: 'SET_LIQUID_CLASS_VALUES',
- liquidClassValues: {
- ...liquidClassValues,
- liquidClassValuesInitialized: true,
- },
- })
- }
- })
-
const isMultiTransferDispense = state?.path === 'multiDispense'
const handleClickCreateTransfer = (): void => {
diff --git a/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/PipettePath.test.tsx b/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/PipettePath.test.tsx
index 770ea82bd55..dd3f3a07ed9 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/PipettePath.test.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/__tests__/QuickTransferAdvancedSettings/PipettePath.test.tsx
@@ -156,9 +156,10 @@ describe('PipettePath', () => {
state: {
...props.state,
transferType: 'distribute',
- disposalVolume: 20,
- blowOutDispense: {
- location: 'source_well',
+ path: 'multiDispense',
+ disposalVolumeDispenseSettings: {
+ volume: 20,
+ blowOutLocation: 'source_well',
flowRate: 10,
},
},
@@ -188,9 +189,9 @@ describe('PipettePath', () => {
...props.state,
transferType: 'distribute',
path: 'multiDispense',
- disposalVolume: 20,
- blowOutDispense: {
- location: 'source_well',
+ disposalVolumeDispenseSettings: {
+ volume: 20,
+ blowOutLocation: 'source_well',
flowRate: 10,
},
},
@@ -221,9 +222,9 @@ describe('PipettePath', () => {
...props.state,
transferType: 'distribute',
path: 'multiDispense',
- disposalVolume: 20,
- blowOutDispense: {
- location: 'source_well',
+ disposalVolumeDispenseSettings: {
+ volume: 20,
+ blowOutLocation: 'source_well',
flowRate: 10,
},
},
@@ -233,9 +234,5 @@ describe('PipettePath', () => {
fireEvent.click(continueBtn)
fireEvent.click(continueBtn)
screen.getByText('Source well')
- const saveBtn = screen.getByTestId('ChildNavigation_Primary_Button')
- fireEvent.click(saveBtn)
- expect(props.dispatch).toHaveBeenCalled()
- expect(mockTrackEventWithRobotSerial).toHaveBeenCalled()
})
})
diff --git a/app/src/organisms/ODD/QuickTransferFlow/__tests__/SummaryAndSettings.test.tsx b/app/src/organisms/ODD/QuickTransferFlow/__tests__/SummaryAndSettings.test.tsx
index 175094d7175..3fba196382d 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/__tests__/SummaryAndSettings.test.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/__tests__/SummaryAndSettings.test.tsx
@@ -5,6 +5,7 @@ import {
useCreateProtocolMutation,
useCreateRunMutation,
} from '@opentrons/react-api-client'
+import { TRASH_BIN_ADAPTER_FIXTURE } from '@opentrons/shared-data'
import { renderWithProviders } from '/app/__testing-utils__'
import { i18n } from '/app/i18n'
@@ -14,6 +15,7 @@ import { useNotifyDeckConfigurationQuery } from '/app/resources/deck_configurati
import { NameQuickTransfer } from '../NameQuickTransfer'
import { Overview } from '../Overview'
+import mockQuickTransferState from '../QuickTransferAdvancedSettings/__fixtures__/QuickTransferState.json'
import { SummaryAndSettings } from '../SummaryAndSettings'
import { createQuickTransferPythonFile, getInitialSummaryState } from '../utils'
@@ -21,6 +23,10 @@ import type { ComponentProps } from 'react'
import type { NavigateFunction } from 'react-router-dom'
const mockNavigate = vi.fn()
+const mockFixture = {
+ cutoutId: 'cutoutA3',
+ cutoutFixtureId: TRASH_BIN_ADAPTER_FIXTURE,
+}
vi.mock('react-router-dom', async importOriginal => {
const reactRouterDom = await importOriginal()
@@ -63,15 +69,19 @@ describe('SummaryAndSettings', () => {
onClick: vi.fn(),
},
state: {
- pipette: {} as any,
+ pipette: mockQuickTransferState.pipette as any,
mount: 'left',
- tipRack: {} as any,
+ tipRack: mockQuickTransferState.tipRack as any,
source: {} as any,
sourceWells: ['A1'],
destination: {} as any,
destinationWells: ['A1'],
transferType: 'transfer',
volume: 25,
+ path: 'single',
+ liquidClassName: 'none',
+ changeTip: 'once',
+ dropTipLocation: undefined,
},
analyticsStartTime: new Date(),
}
@@ -79,9 +89,7 @@ describe('SummaryAndSettings', () => {
() => new Promise(resolve => resolve({}))
)
vi.mocked(useNotifyDeckConfigurationQuery).mockReturnValue({
- data: {
- data: [],
- },
+ data: [mockFixture],
} as any)
vi.mocked(useTrackEventWithRobotSerial).mockReturnValue({
trackEventWithRobotSerial: mockTrackEventWithRobotSerial,
diff --git a/app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/getInitialSummaryState.test.ts b/app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/getInitialSummaryState.test.ts
index 69e9aa16385..82017c950c0 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/getInitialSummaryState.test.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/__tests__/utils/getInitialSummaryState.test.ts
@@ -42,6 +42,13 @@ describe('getInitialSummaryState', () => {
path: 'single',
liquidClassValuesInitialized: false,
changeTip: 'always',
+ blowOutDispense: {
+ flowRate: 75,
+ location: {
+ cutoutFixtureId: 'trashBinAdapter',
+ cutoutId: 'cutoutA3',
+ },
+ },
} as any,
deckConfig: [
{
@@ -125,17 +132,71 @@ describe('getInitialSummaryState', () => {
})
})
it('generates the summary state with correct default value for 1 to n transfer', () => {
+ const distributeProps = {
+ state: {
+ pipette: {
+ channels: 1,
+ liquids: {
+ default: {
+ maxVolume: 100,
+ supportedTips: {
+ t50: {
+ defaultAspirateFlowRate: {
+ default: 50,
+ },
+ defaultDispenseFlowRate: {
+ default: 75,
+ },
+ },
+ },
+ },
+ },
+ } as any,
+ mount: 'left',
+ tipRack: {
+ wells: {
+ A1: {
+ totalLiquidVolume: 50,
+ },
+ },
+ } as any,
+ source: {} as any,
+ sourceWells: ['A1'],
+ destination: 'source',
+ destinationWells: ['A1'],
+ transferType: 'transfer',
+ volume: 25,
+ path: 'single',
+ liquidClassValuesInitialized: false,
+ changeTip: 'always',
+ disposalVolumeDispenseSettings: {
+ volume: 1,
+ flowRate: 75,
+ blowoutLocation: {
+ cutoutFixtureId: 'trashBinAdapter',
+ cutoutId: 'cutoutA3',
+ },
+ },
+ } as any,
+ deckConfig: [
+ {
+ cutoutId: 'cutoutA3',
+ cutoutFixtureId: 'trashBinAdapter',
+ },
+ ],
+ } as any
+
const initialSummaryState = getInitialSummaryState({
- ...props,
+ ...distributeProps,
state: {
- ...props.state,
+ ...distributeProps.state,
volume: 1,
path: 'multiDispense',
transferType: 'distribute',
},
})
expect(initialSummaryState).toEqual({
- ...props.state,
+ ...distributeProps.state,
volume: 1,
transferType: 'distribute',
aspirateFlowRate: 50,
@@ -149,11 +210,6 @@ describe('getInitialSummaryState', () => {
cutoutId: 'cutoutA3',
cutoutFixtureId: 'trashBinAdapter',
},
- disposalVolume: 1,
- blowOutDispense: {
- location: { cutoutId: 'cutoutA3', cutoutFixtureId: 'trashBinAdapter' },
- flowRate: 75,
- },
})
})
it('generates the summary state with correct default value for 1 to n transfer with too high of volume for multiDispense', () => {
diff --git a/app/src/organisms/ODD/QuickTransferFlow/constants.ts b/app/src/organisms/ODD/QuickTransferFlow/constants.ts
index ba9cd74ed5d..b4827c2f774 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/constants.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/constants.ts
@@ -138,6 +138,7 @@ export const SINGLE_CHANNEL_COMPATIBLE_LABWARE = [
'opentrons/opentrons_tough_4_reservoir_72ml/1',
'opentrons/opentrons_universal_flat_adapter_corning_384_wellplate_112ul_flat/1',
'opentrons/smc_384_read_plate/2',
+ 'opentrons/thermofisher_nunc_maxisorp_lockwell_elisa/1',
'opentrons/thermoscientific_96_wellplate_800ul/1',
'opentrons/thermoscientific_abgene_96_wellplate_1.2ml/1',
'opentrons/thermoscientificnunc_96_wellplate_1300ul/3',
@@ -209,6 +210,7 @@ export const EIGHT_CHANNEL_COMPATIBLE_LABWARE = [
'opentrons/opentrons_tough_4_reservoir_72ml/1',
'opentrons/opentrons_universal_flat_adapter_corning_384_wellplate_112ul_flat/1',
'opentrons/smc_384_read_plate/2',
+ 'opentrons/thermofisher_nunc_maxisorp_lockwell_elisa/1',
'opentrons/thermoscientific_96_wellplate_800ul/1',
'opentrons/thermoscientific_abgene_96_wellplate_1.2ml/1',
'opentrons/thermoscientificnunc_96_wellplate_1300ul/3',
@@ -281,6 +283,7 @@ export const NINETY_SIX_CHANNEL_COMPATIBLE_LABWARE = [
'opentrons/opentrons_tough_4_reservoir_72ml/1',
'opentrons/opentrons_universal_flat_adapter_corning_384_wellplate_112ul_flat/1',
'opentrons/smc_384_read_plate/2',
+ 'opentrons/thermofisher_nunc_maxisorp_lockwell_elisa/1',
'opentrons/thermoscientific_96_wellplate_800ul/1',
'opentrons/thermoscientific_abgene_96_wellplate_1.2ml/1',
'opentrons/thermoscientificnunc_96_wellplate_1300ul/3',
diff --git a/app/src/organisms/ODD/QuickTransferFlow/reducers.ts b/app/src/organisms/ODD/QuickTransferFlow/reducers.ts
index 38ab279361e..dfe32e9fed4 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/reducers.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/reducers.ts
@@ -96,6 +96,7 @@ export function quickTransferWizardReducer(
path: action.path,
}
}
+
case 'SET_CHANGE_TIP': {
return {
...state,
@@ -135,22 +136,9 @@ export function quickTransferSummaryReducer(
}
}
case 'SET_PIPETTE_PATH': {
- if (action.path === 'multiDispense') {
- return {
- ...state,
- path: action.path,
- disposalVolume: action.disposalVolume,
- blowOutDispense: {
- location: action.blowOutLocation,
- flowRate: state.dispenseFlowRate,
- },
- }
- } else {
- return {
- ...state,
- path: action.path,
- disposalVolume: undefined,
- }
+ return {
+ ...state,
+ path: action.path,
}
}
case 'SET_ASPIRATE_TIP_POSITION': {
diff --git a/app/src/organisms/ODD/QuickTransferFlow/types.ts b/app/src/organisms/ODD/QuickTransferFlow/types.ts
index 3c7a23cbe1c..09dcd9f2976 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/types.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/types.ts
@@ -29,6 +29,11 @@ export interface QuickTransferWizardState {
changeTip?: ChangeTipOptions
dropTipLocation?: CutoutConfig | string
liquidClassName?: string
+ disposalVolumeDispenseSettings?: {
+ volume: number
+ blowOutLocation: BlowOutLocation
+ flowRate: number
+ }
}
export type PathOption = 'single' | 'multiAspirate' | 'multiDispense'
export type ChangeTipOptions =
@@ -113,7 +118,6 @@ export interface QuickTransferSummaryState {
}
touchTipDispense?: number // specifies the tip position from the top of the well
touchTipDispenseSpeed?: number
- disposalVolume?: number
blowOutDispense?: {
location?: BlowOutLocation
flowRate?: number
@@ -188,8 +192,6 @@ interface SetDispenseFlowRateAction {
interface SetPipettePath {
type: typeof ACTIONS.SET_PIPETTE_PATH
path: PathOption
- disposalVolume?: number
- blowOutLocation?: BlowOutLocation
}
interface SetAspirateTipPosition {
type: typeof ACTIONS.SET_ASPIRATE_TIP_POSITION
diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/generateQuickTransferArgs.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/generateQuickTransferArgs.ts
index 491f8de38e4..29d1e1fb571 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/utils/generateQuickTransferArgs.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/utils/generateQuickTransferArgs.ts
@@ -353,30 +353,34 @@ export function generateQuickTransferArgs(
)
let blowoutLocation: string | undefined
+ const blowOutDispenseLocation =
+ quickTransferState.path === 'multiDispense'
+ ? quickTransferState.disposalVolumeDispenseSettings?.blowOutLocation
+ : quickTransferState.blowOutDispense?.location
+
if (
- quickTransferState?.blowOutDispense?.location != null &&
- quickTransferState.blowOutDispense.location !== 'source_well' &&
- quickTransferState.blowOutDispense.location !== 'dest_well' &&
- 'cutoutId' in quickTransferState.blowOutDispense.location
+ blowOutDispenseLocation != null &&
+ blowOutDispenseLocation !== 'source_well' &&
+ blowOutDispenseLocation !== 'dest_well' &&
+ typeof blowOutDispenseLocation === 'object' &&
+ 'cutoutId' in blowOutDispenseLocation
) {
const trashBinEntity = Object.values(
invariantContext.trashBinEntities
).find(entity => {
- const blowoutObject = quickTransferState.blowOutDispense
- ?.location as CutoutConfig
+ const blowoutObject = blowOutDispenseLocation as CutoutConfig
return entity.location === blowoutObject.cutoutId
})
const wasteChuteEntity = Object.values(
invariantContext.wasteChuteEntities
).find(entity => {
- const blowoutObject = quickTransferState.blowOutDispense
- ?.location as CutoutConfig
+ const blowoutObject = blowOutDispenseLocation as CutoutConfig
return entity.location === blowoutObject.cutoutId
})
const entity = trashBinEntity != null ? trashBinEntity : wasteChuteEntity
blowoutLocation = entity?.id
} else {
- blowoutLocation = quickTransferState.blowOutDispense?.location
+ blowoutLocation = blowOutDispenseLocation as string | undefined
}
const dropTipTrashBinLocationEntity = Object.values(
@@ -455,7 +459,10 @@ export function generateQuickTransferArgs(
aspirateOffsetFromBottomMm: quickTransferState.tipPositionAspirate,
dispenseOffsetFromBottomMm: quickTransferState.tipPositionDispense,
blowoutLocation,
- blowoutFlowRateUlSec: quickTransferState.blowOutDispense?.flowRate ?? 0,
+ blowoutFlowRateUlSec:
+ quickTransferState.path === 'multiDispense'
+ ? (quickTransferState.disposalVolumeDispenseSettings?.flowRate ?? 0)
+ : (quickTransferState.blowOutDispense?.flowRate ?? 0),
blowoutOffsetFromTopMm: DEFAULT_MM_BLOWOUT_OFFSET_FROM_TOP,
changeTip: quickTransferState.changeTip,
preWetTip: quickTransferState.preWetTip,
diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/getInitialSummaryState.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/getInitialSummaryState.ts
index 53334d4c4f3..5cccfd08fe7 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/utils/getInitialSummaryState.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/utils/getInitialSummaryState.ts
@@ -12,13 +12,14 @@ import type {
PipetteV2Specs,
} from '@opentrons/shared-data'
import type {
+ BlowOutLocation,
ChangeTipOptions,
PathOption,
QuickTransferSummaryState,
TransferType,
} from '../types'
-interface InitialSummaryStateProps {
+export interface InitialSummaryStateProps {
state: {
pipette: PipetteV2Specs
mount: Mount
@@ -36,6 +37,11 @@ interface InitialSummaryStateProps {
}
changeTip: ChangeTipOptions
dropTipLocation?: CutoutConfig
+ disposalVolumeDispenseSettings?: {
+ volume: number
+ blowOutLocation: BlowOutLocation
+ flowRate: number
+ }
}
deckConfig: DeckConfiguration
}
@@ -96,9 +102,12 @@ export function getInitialSummaryState(
aspirateFlowRate: flowRatesForSupportedTip.defaultAspirateFlowRate.default,
dispenseFlowRate: flowRatesForSupportedTip.defaultDispenseFlowRate.default,
path,
- disposalVolume: path === 'multiDispense' ? state.volume : undefined,
- blowOutDispense:
+ disposalVolumeDispenseSettings:
path === 'multiDispense'
+ ? state.disposalVolumeDispenseSettings
+ : undefined,
+ blowOutDispense:
+ path !== 'multiDispense'
? {
location: trashConfigCutout,
flowRate: flowRatesForSupportedTip.defaultDispenseFlowRate.default,
diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/index.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/index.ts
index f20af11032f..c45e82c72a0 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/utils/index.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/utils/index.ts
@@ -11,4 +11,5 @@ export { getMaxUiFlowRate } from './getMaxUiFlowRate'
export { getPipetteName } from './getPipetteName'
export { getSelectedWellCount } from './getSelectedWellCount'
export { getVolumeRange } from './getVolumeRange'
+export { initializeSummaryState } from './initializeSummaryState'
export { retrieveLiquidClassValues } from './retrieveLiquidClassValues'
diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/initializeSummaryState.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/initializeSummaryState.ts
new file mode 100644
index 00000000000..7aa7e33c30d
--- /dev/null
+++ b/app/src/organisms/ODD/QuickTransferFlow/utils/initializeSummaryState.ts
@@ -0,0 +1,19 @@
+import { getInitialSummaryState } from './getInitialSummaryState'
+import { retrieveLiquidClassValues } from './retrieveLiquidClassValues'
+
+import type { QuickTransferSummaryState } from '../types'
+import type { InitialSummaryStateProps } from './getInitialSummaryState'
+
+export const initializeSummaryState = (
+ props: InitialSummaryStateProps
+): QuickTransferSummaryState => {
+ const baseState = getInitialSummaryState(props)
+
+ const liquidClassValues = retrieveLiquidClassValues(baseState, 'all')
+
+ return {
+ ...baseState,
+ ...liquidClassValues,
+ liquidClassValuesInitialized: true,
+ }
+}
diff --git a/app/src/organisms/ODD/QuickTransferFlow/utils/retrieveLiquidClassValues.ts b/app/src/organisms/ODD/QuickTransferFlow/utils/retrieveLiquidClassValues.ts
index 5e6242d7c1f..c5376dee763 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/utils/retrieveLiquidClassValues.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/utils/retrieveLiquidClassValues.ts
@@ -166,7 +166,7 @@ const getNoLiquidClassValues = (
dispenseMaxUiFlowRate
)
- const aspirateState = {
+ const aspirateState: Partial = {
aspirateFlowRate: aspirateFlowRateFields.aspirate_flowRate ?? 0,
tipPositionAspirate: DEFAULT_MM_OFFSET_FROM_BOTTOM,
submergeAspirate: {
@@ -193,7 +193,7 @@ const getNoLiquidClassValues = (
conditionAspirate: actualConditioningVolume ?? 0,
}
- const dispenseState = {
+ const dispenseState: Partial = {
dispenseFlowRate: dispenseFlowRateFields.dispense_flowRate ?? 0,
tipPositionDispense: DEFAULT_MM_OFFSET_FROM_BOTTOM,
submergeDispense: {
@@ -220,7 +220,7 @@ const getNoLiquidClassValues = (
: dispense.retract.touchTip.params?.zOffset,
touchTipDispenseSpeed: dispense.retract.touchTip.params?.speed,
disposalVolumeDispenseSettings: {
- volume: 0,
+ volume: pipette.liquids.default.minVolume,
blowOutLocation:
convertBlowoutLocation(
dispense?.retract.blowout?.params?.location,
diff --git a/app/src/organisms/ODD/RobotSettingsDashboard/CameraPreferences.tsx b/app/src/organisms/ODD/RobotSettingsDashboard/CameraPreferences.tsx
index d67a9e89ada..89cb8c0ca66 100644
--- a/app/src/organisms/ODD/RobotSettingsDashboard/CameraPreferences.tsx
+++ b/app/src/organisms/ODD/RobotSettingsDashboard/CameraPreferences.tsx
@@ -36,6 +36,7 @@ export function CameraPreferences({
toggleLiveStreamEnabled={settings.toggleLiveVideoEnabled}
storageInfo={null}
isCameraRequired={null}
+ runId={null}
/>
)
}
diff --git a/app/src/organisms/ODD/RunningProtocol/ConfirmCancelRunModal/index.tsx b/app/src/organisms/ODD/RunningProtocol/ConfirmCancelRunModal/index.tsx
index 436a6672528..f54356a9c94 100644
--- a/app/src/organisms/ODD/RunningProtocol/ConfirmCancelRunModal/index.tsx
+++ b/app/src/organisms/ODD/RunningProtocol/ConfirmCancelRunModal/index.tsx
@@ -6,7 +6,6 @@ import { useNavigate } from 'react-router-dom'
import { RUN_STATUS_STOPPED } from '@opentrons/api-client'
import { COLORS, LegacyStyledText } from '@opentrons/components'
import {
- useDeleteRunMutation,
useDismissCurrentRunMutation,
useStopRunMutation,
} from '@opentrons/react-api-client'
@@ -40,20 +39,8 @@ export function ConfirmCancelRunModal({
}: ConfirmCancelRunModalProps): JSX.Element {
const { t } = useTranslation(['run_details', 'shared'])
const { stopRun } = useStopRunMutation()
- const { deleteRun } = useDeleteRunMutation({
- onError: error => {
- setIsCanceling(false)
- console.error('Error deleting quick transfer run', error)
- },
- })
const { dismissCurrentRun, isLoading: isDismissing } =
- useDismissCurrentRunMutation({
- onSettled: () => {
- if (isQuickTransfer) {
- deleteRun(runId)
- }
- },
- })
+ useDismissCurrentRunMutation()
const localRobot = useSelector(getLocalRobot)
const { data, isError: isRunFetchError } = useNotifyRunQuery(runId)
const runStatus = data?.data.status
diff --git a/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx b/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx
index 0536b2ef420..e78a7fc0101 100644
--- a/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx
+++ b/app/src/organisms/PipetteWizardFlows/AttachProbe.tsx
@@ -1,6 +1,5 @@
import { useState } from 'react'
import { Trans, useTranslation } from 'react-i18next'
-import capitalize from 'lodash/capitalize'
import { css } from 'styled-components'
import {
@@ -69,7 +68,7 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => {
proceed()
}
- const { t, i18n } = useTranslation('pipette_wizard_flows')
+ const { t, i18n } = useTranslation(['pipette_wizard_flows', 'shared'])
const pipetteWizardStep = { mount, flowType, section: SECTIONS.ATTACH_PROBE }
const [showUnableToDetect, setShowUnableToDetect] = useState(false)
const pipetteId = attachedPipettes[mount]?.serialNumber
@@ -199,7 +198,7 @@ export const AttachProbe = (props: AttachProbeProps): JSX.Element | null => {
}
proceedButtonText={
is96Channel && isWasteChuteOnDeck(deckConfig)
- ? capitalize('shared:continue')
+ ? t('shared:continue')
: t('begin_calibration')
}
proceed={
diff --git a/app/src/organisms/RunTimeControl/__tests__/hooks.test.tsx b/app/src/organisms/RunTimeControl/__tests__/hooks.test.tsx
index 4a324bb8fe2..accf2a1c5ff 100644
--- a/app/src/organisms/RunTimeControl/__tests__/hooks.test.tsx
+++ b/app/src/organisms/RunTimeControl/__tests__/hooks.test.tsx
@@ -4,13 +4,13 @@ import { when } from 'vitest-when'
import '@testing-library/jest-dom/vitest'
+import { RUN_STATUS_RUNNING } from '@opentrons/api-client'
import { useRunActionMutations } from '@opentrons/react-api-client'
import {
useCloneRun,
useCurrentRunId,
useNotifyRunQuery,
- useRunStatus,
} from '/app/resources/runs'
import {
mockPausedRun,
@@ -82,9 +82,17 @@ describe('useCurrentRunStatus hook', () => {
})
it('returns the run status of the current run', async () => {
- when(useRunStatus).calledWith(RUN_ID_2).thenReturn('running')
- const { result } = renderHook(useCurrentRunStatus)
- expect(result.current).toBe('running')
+ when(useNotifyRunQuery)
+ .calledWith(RUN_ID_2, expect.any(Object))
+ .thenReturn({
+ data: {
+ data: {
+ ...mockRunningRun,
+ },
+ },
+ } as unknown as UseQueryResult)
+ const { result } = renderHook(() => useCurrentRunStatus({}))
+ expect(result.current).toBe(RUN_STATUS_RUNNING)
})
})
diff --git a/app/src/organisms/RunTimeControl/hooks.ts b/app/src/organisms/RunTimeControl/hooks.ts
index bbe44c2f5fe..f4a76db13ef 100644
--- a/app/src/organisms/RunTimeControl/hooks.ts
+++ b/app/src/organisms/RunTimeControl/hooks.ts
@@ -2,11 +2,11 @@ import { useRunActionMutations } from '@opentrons/react-api-client'
import {
DEFAULT_RUN_QUERY_REFETCH_INTERVAL,
+ DEFAULT_STATUS_REFETCH_INTERVAL,
useCloneRun,
useCurrentRunId,
useMostRecentCompletedAnalysis,
useNotifyRunQuery,
- useRunStatus,
} from '/app/resources/runs'
import type { UseQueryOptions } from 'react-query'
@@ -66,8 +66,11 @@ export function useCurrentRunStatus(
options?: UseQueryOptions
): RunStatus | null {
const currentRunId = useCurrentRunId()
-
- return useRunStatus(currentRunId, options)
+ const { data: runRecord } = useNotifyRunQuery(currentRunId, {
+ ...options,
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ return runRecord?.data.status ?? null
}
export function useRunErrors(runId: string | null): RunData['errors'] {
diff --git a/app/src/pages/Desktop/Devices/DeviceDetails/DeviceDetailsComponent.tsx b/app/src/pages/Desktop/Devices/DeviceDetails/DeviceDetailsComponent.tsx
index c66b5447726..a148fb9baa7 100644
--- a/app/src/pages/Desktop/Devices/DeviceDetails/DeviceDetailsComponent.tsx
+++ b/app/src/pages/Desktop/Devices/DeviceDetails/DeviceDetailsComponent.tsx
@@ -83,7 +83,6 @@ export function DeviceDetailsComponent({
-
-export const getStagingAreaAddressableAreas = (
- cutoutIds: CutoutId[],
- filterStandardSlots: boolean = true
-): AddressableAreaName[] => {
- const deckDef = getDeckDefFromRobotType(FLEX_ROBOT_TYPE)
- const cutoutFixtures = deckDef.cutoutFixtures
-
- const addressableAreasRaw = cutoutIds.flatMap(cutoutId => {
- const addressableAreasOnCutout = cutoutFixtures.find(
- cutoutFixture => cutoutFixture.id === STAGING_AREA_RIGHT_SLOT_FIXTURE
- )?.providesAddressableAreas[cutoutId]
- return addressableAreasOnCutout ?? []
- })
- if (filterStandardSlots) {
- return addressableAreasRaw.filter(
- aa => !isAddressableAreaStandardSlot(aa, deckDef)
- )
- }
- return addressableAreasRaw
-}
-
-export const getSlotIsEmpty = (
- robotState: RobotState,
- slot: string
-): boolean => {
- const modulesInSlot = values(robotState.modules).filter(
- moduleTemporalProperties => {
- return slot.includes(moduleTemporalProperties.slot)
- }
- )
- const labwareInSlot = values(robotState.labware).filter(
- labwareTemporalProperties =>
- getSlotInLocationStack(labwareTemporalProperties.stack) === slot
- )
-
- return modulesInSlot.length === 0 && labwareInSlot.length === 0
-}
-
-export const getSlotIdsBlockedBySpanningForThermocycler = (
- modules: RobotState['modules'],
- moduleEntities: ModuleEntities,
- robotType: RobotType
-): DeckSlot[] => {
- const loadedThermocycler = Object.keys(modules).find(
- id => moduleEntities[id].type === THERMOCYCLER_MODULE_TYPE
- )
- if (loadedThermocycler != null && robotType === FLEX_ROBOT_TYPE) {
- return ['A1', 'B1']
- } else if (loadedThermocycler != null && robotType === OT2_ROBOT_TYPE) {
- return ['7', '8', '10', '11']
- }
-
- return []
-}
-
-export const getAllWellContentsAtFrame = (
- liquidState: RobotState['liquidState'],
- labwareDef: LabwareDefinition2
-): WellContentsByLabware => {
- const labwareLiquidState = liquidState.labware
- const wellContentsByLabwareId = mapValues(
- labwareLiquidState,
- (labwareLiquids: SingleLabwareLiquidState, labwareId: string) => {
- return _wellContentsForLabware(labwareLiquids, labwareDef)
- }
- )
- return wellContentsByLabwareId
-}
-
-export const getLiquidDetailInfo = (
- wellContents: ContentsByWell,
- liquids: Liquid[]
-): LiquidDetailInfo[] => {
- const individualIds = getLiquidIdsOnLabware(wellContents)
- const volumesPerLiquid = getVolumesPerLiquid(wellContents, individualIds)
- const liquidInfo: LiquidDetailInfo[] = individualIds.map(liquidId => {
- const totalVolume = sum(Object.values(volumesPerLiquid[liquidId]))
- const matchingLiquid = liquids.find(liquid => liquid.id === liquidId)
-
- return {
- totalVolume,
- // TODO: add default liquid color
- color: matchingLiquid?.displayColor ?? COLORS.black70,
- displayName: matchingLiquid?.displayName ?? 'unknown display name',
- }
- })
- return liquidInfo
-}
-
-export const getMissingTips = (
- tipState: RobotState['tipState'],
- labwareId: string
-): WellGroup | null => {
- const missingTipsByLabwareId =
- tipState &&
- mapValues(tipState.tipracks, tipMap =>
- reduce(
- tipMap,
- (acc, hasTip, wellName): WellGroup =>
- hasTip ? acc : { ...acc, [wellName]: null },
- {}
- )
- )
- const missingTips = missingTipsByLabwareId
- ? missingTipsByLabwareId[labwareId]
- : null
-
- return missingTips
-}
-
-interface ActiveLayer {
- isActiveLayerVisible: boolean
-}
-
-export const getActiveLayer = (
- id: string,
- selectedRunTimeCommand?: RunTimeCommand
-): ActiveLayer => {
- const isStepAssosciatedWithLabwareId =
- selectedRunTimeCommand != null &&
- 'labwareId' in selectedRunTimeCommand.params &&
- selectedRunTimeCommand.params.labwareId === id
- const isMoveStepAssosciatedWithLabwareId =
- selectedRunTimeCommand != null &&
- selectedRunTimeCommand.commandType === 'moveLabware' &&
- 'labwareId' in selectedRunTimeCommand.params &&
- selectedRunTimeCommand.params.labwareId === id
-
- const isStepAssosciatedWithLabware =
- isStepAssosciatedWithLabwareId || isMoveStepAssosciatedWithLabwareId
-
- return {
- isActiveLayerVisible: isStepAssosciatedWithLabware,
- }
-}
-
-export const getTopmostLabwareOnModuleFromStack = (
- moduleId: string,
- labware: LabwareTemporalProperties[]
-): string => {
- return labware
- .filter(lw => lw.stack.includes(moduleId)) // all stacks involving this module
- .sort((a, b) => b.stack.length - a.stack.length)[0]?.stack[0] // return topmost labware from largest stack
-}
-
-export const getChannels = (
- channels: number | null,
- nozzles?: NozzleConfigurationStyle
-): number => {
- let numChannels = channels ?? 1
- if (nozzles === SINGLE) {
- numChannels = 1
- } else if (nozzles === COLUMN) {
- numChannels = 8
- } else if (nozzles === ROW) {
- numChannels = 12
- }
- return numChannels
-}
-
-export function getNextGroupFirstCommandId(
- groupedCommands: GroupedCommands | null,
- currentCommandId: string
-): string | null {
- if (groupedCommands == null) {
- return null
- }
-
- const currentIndex = groupedCommands.findIndex(group => {
- if ('subCommands' in group) {
- return group.subCommands.some(
- leaf => leaf.command.id === currentCommandId
- )
- } else {
- return group.command.id === currentCommandId
- }
- })
-
- if (currentIndex === -1 || currentIndex + 1 >= groupedCommands.length) {
- return null // No next group
- }
-
- const nextGroup = groupedCommands[currentIndex + 1]
-
- if ('subCommands' in nextGroup) {
- return nextGroup.subCommands[0]?.command.id ?? null
- } else {
- return nextGroup.command.id
- }
-}
-
-export function getPreviousGroupFirstCommandId(
- groupedCommands: GroupedCommands | null,
- currentCommandId: string
-): string | null {
- if (!groupedCommands) {
- return null
- }
-
- const currentIndex = groupedCommands.findIndex(group => {
- if ('subCommands' in group) {
- return group.subCommands.some(
- leaf => leaf.command.id === currentCommandId
- )
- } else {
- return group.command.id === currentCommandId
- }
- })
-
- if (currentIndex <= 0) {
- return null
- }
-
- const previousGroup = groupedCommands[currentIndex - 1]
-
- if ('subCommands' in previousGroup) {
- return previousGroup.subCommands[0]?.command.id ?? null
- } else {
- return previousGroup.command.id
- }
-}
-
-export const getThermocyclerOverlayText = (
- commandType: RunTimeCommand['commandType']
-): string => {
- switch (commandType) {
- case 'loadModule':
- return 'Load Thermocycler'
- case 'thermocycler/openLid':
- return 'Opening lid'
- case 'thermocycler/closeLid':
- return 'Closing lid'
- case 'thermocycler/setTargetBlockTemperature':
- return 'Setting block temperature'
- case 'thermocycler/waitForLidTemperature':
- return 'Setting lid temperature'
- default:
- // TODO: the rest of the copy isn't needed for protocol viz user testing purposes
- return 'Changing thermocycler state'
- }
-}
-
-export const getIsCutoutA1Active = (
- labware: RobotState['labware'],
- modules: RobotState['modules'],
- cutoutId: CutoutId,
- selectedRunTimeCommand?: RunTimeCommand
-): boolean => {
- const labwareOnB1 = Object.entries(labware).find(
- ([_, lw]) => getSlotInLocationStack(lw.stack) === 'B1'
- )
- const hasThermocycler = Object.values(modules).some(
- module => module.moduleState.type === THERMOCYCLER_MODULE_TYPE
- )
-
- const { isActiveLayerVisible: isThermocyclerActive } =
- labwareOnB1 != null
- ? getActiveLayer(labwareOnB1[0], selectedRunTimeCommand)
- : { isActiveLayerVisible: false }
-
- return isThermocyclerActive && hasThermocycler && cutoutId === 'cutoutA1'
-}
-
-export const getModuleInnerProps = (
- moduleState: ModuleTemporalProperties['moduleState']
-): ComponentProps['innerProps'] => {
- if (moduleState.type === THERMOCYCLER_MODULE_TYPE) {
- let lidMotorState = 'unknown'
- if (moduleState.lidOpen) {
- lidMotorState = 'open'
- } else if (moduleState.lidOpen === false) {
- lidMotorState = 'closed'
- }
- return {
- lidMotorState,
- blockTargetTemp: moduleState.blockTargetTemp,
- }
- } else if (
- 'targetTemperature' in moduleState &&
- moduleState.type === 'temperatureModuleType'
- ) {
- return {
- targetTemperature: moduleState.targetTemperature,
- }
- } else if ('targetTemp' in moduleState) {
- return {
- targetTemp: moduleState.targetTemp,
- }
- }
-}
-
-// TODO: the dropTipInPlace, airGapInplace, and
-// blowoutInPlace commands don't have
-// any knowledge of where its dropping. would be
-// nice to expand the results key to include the
-// addressable area name
-export const getIsPipetteOverTrash = (
- pipettes: RobotState['pipettes'],
- id: string,
- selectedRunTimeCommand?: RunTimeCommand
-): boolean =>
- Object.values(pipettes).some(pipette => pipette.entityId === id) &&
- selectedRunTimeCommand != null &&
- POTENTIAL_TRASH_COMMAND_TYPES.includes(selectedRunTimeCommand.commandType)
-
-export const getFixtureSummaryInfo = (
- pipettes: RobotState['pipettes'],
- entities: TrashBinEntities | WasteChuteEntities,
- selectedRunTimeCommand?: RunTimeCommand
-): {
- isPipetteOverTrash: boolean
- trashLikeEntityCutoutId: CutoutId | null
-} => {
- const pipetteCurrentTrashId = Object.values(pipettes).find(
- pipette => pipette.entityId != null && entities[pipette.entityId] != null
- )?.entityId
- const isPipetteOverTrash =
- pipetteCurrentTrashId != null
- ? getIsPipetteOverTrash(
- pipettes,
- pipetteCurrentTrashId,
- selectedRunTimeCommand
- )
- : false
- const trashLikeEntityCutoutId =
- pipetteCurrentTrashId != null
- ? (entities[pipetteCurrentTrashId].location as CutoutId)
- : null
-
- return { isPipetteOverTrash, trashLikeEntityCutoutId }
-}
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/visualization.module.css b/app/src/pages/Desktop/Protocols/ProtocolVisualization/visualization.module.css
index b978e832a1a..eca1ffefe79 100644
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/visualization.module.css
+++ b/app/src/pages/Desktop/Protocols/ProtocolVisualization/visualization.module.css
@@ -122,15 +122,6 @@
pointer-events: auto;
}
-.deck_view_container {
- width: 100%;
- height: 100%;
- padding: 28px 32px;
- border-radius: var(--border-radius-8);
- background-color: var(--white);
- gap: var(--spacing-20);
-}
-
.detail_container {
display: flex;
height: 100%;
@@ -152,19 +143,6 @@
background-color: var(--white);
}
-.command_step_header {
- display: flex;
- justify-content: space-between;
- padding: var(--spacing-16);
-}
-
-.command_step_groups {
- height: 39rem;
- min-height: 0;
- flex: 1;
- overflow-y: auto;
-}
-
.slot_details {
height: 100vh;
border-radius: var(--border-radius-8);
diff --git a/app/src/pages/Desktop/StepDetailViewer/index.tsx b/app/src/pages/Desktop/StepDetailViewer/index.tsx
index a64144f29c1..4f9e8af4776 100644
--- a/app/src/pages/Desktop/StepDetailViewer/index.tsx
+++ b/app/src/pages/Desktop/StepDetailViewer/index.tsx
@@ -1,7 +1,7 @@
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
-import { SlotDetails } from '../Protocols/ProtocolVisualization/SlotDetails'
+import { SlotDetails } from '/app/organisms/Desktop/ProtocolVisualization/SlotDetails'
import type {
Liquid,
diff --git a/app/src/pages/ODD/ProtocolSetup/__tests__/ProtocolSetup.test.tsx b/app/src/pages/ODD/ProtocolSetup/__tests__/ProtocolSetup.test.tsx
index 03eba2d8a8b..fb2729a678f 100644
--- a/app/src/pages/ODD/ProtocolSetup/__tests__/ProtocolSetup.test.tsx
+++ b/app/src/pages/ODD/ProtocolSetup/__tests__/ProtocolSetup.test.tsx
@@ -3,7 +3,7 @@ import { fireEvent, screen } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { when } from 'vitest-when'
-import { RUN_STATUS_IDLE, RUN_STATUS_STOPPED } from '@opentrons/api-client'
+import { RUN_STATUS_STOPPED } from '@opentrons/api-client'
import {
useAddCameraSettingsToRunMutation,
useAllPipetteOffsetCalibrationsQuery,
@@ -80,7 +80,6 @@ import {
useNotifyRunQuery,
useProtocolAnalysisErrors,
useRunCreatedAtTimestamp,
- useRunStatus,
} from '/app/resources/runs'
import { getProtocolModulesInfo } from '/app/transformations/analysis'
@@ -279,7 +278,6 @@ describe('ProtocolSetup', () => {
isResumeRunFromRecoveryActionLoading: false,
isRunControlLoading: false,
})
- when(vi.mocked(useRunStatus)).calledWith(RUN_ID).thenReturn(RUN_STATUS_IDLE)
vi.mocked(useProtocolAnalysisAsDocumentQuery).mockReturnValue({
data: mockEmptyAnalysis,
} as any)
@@ -300,6 +298,7 @@ describe('ProtocolSetup', () => {
data: {
protocolId: PROTOCOL_ID,
labwareOffsets: [mockOffset],
+ status: RUN_STATUS_STOPPED,
},
},
} as any)
@@ -607,7 +606,6 @@ describe('ProtocolSetup', () => {
})
it('should redirect to the protocols page when a run is stopped', () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_STOPPED)
render(`/runs/${RUN_ID}/setup/`)
expect(mockNavigate).toHaveBeenCalledWith('/protocols')
})
diff --git a/app/src/pages/ODD/ProtocolSetup/index.tsx b/app/src/pages/ODD/ProtocolSetup/index.tsx
index e462891a411..326c7d42f0b 100644
--- a/app/src/pages/ODD/ProtocolSetup/index.tsx
+++ b/app/src/pages/ODD/ProtocolSetup/index.tsx
@@ -103,7 +103,6 @@ import {
useMostRecentCompletedAnalysis,
useNotifyRunQuery,
useProtocolAnalysisErrors,
- useRunStatus,
} from '/app/resources/runs'
import { getProtocolModulesInfo } from '/app/transformations/analysis'
import {
@@ -762,6 +761,7 @@ export function ProtocolSetup(): JSX.Element {
staleTime: Infinity,
refetchInterval: RUN_RECORD_REFETCH_MS,
})
+ const runStatus = runRecord?.data.status ?? null
const dispatch = useDispatch()
const { analysisErrors } = useProtocolAnalysisErrors(runId)
const robotProtocolAnalysis = useMostRecentCompletedAnalysis(runId)
@@ -793,7 +793,7 @@ export function ProtocolSetup(): JSX.Element {
.data?.data.id != null
const navigate = useNavigate()
- const runStatus = useRunStatus(runId)
+
if (runStatus === RUN_STATUS_STOPPED) {
navigate('/protocols')
}
diff --git a/app/src/pages/ODD/RobotDashboard/index.tsx b/app/src/pages/ODD/RobotDashboard/index.tsx
index b8370a86ad5..764eec301fe 100644
--- a/app/src/pages/ODD/RobotDashboard/index.tsx
+++ b/app/src/pages/ODD/RobotDashboard/index.tsx
@@ -10,7 +10,6 @@ import {
SPACING,
TYPOGRAPHY,
} from '@opentrons/components'
-import { useAllProtocolsQuery } from '@opentrons/react-api-client'
import { Navigation } from '/app/organisms/ODD/Navigation'
import {
@@ -31,7 +30,6 @@ export function RobotDashboard(): JSX.Element {
const { t } = useTranslation('device_details')
const { data: allRunsQueryData, error: allRunsQueryError } =
useNotifyAllRunsQuery()
- const protocols = useAllProtocolsQuery()
const { unfinishedUnboxingFlowRoute } = useSelector(
getOnDeviceDisplaySettings
@@ -46,11 +44,6 @@ export function RobotDashboard(): JSX.Element {
acc.some(collectedRun => collectedRun.protocolId === run.protocolId)
) {
return acc
- } else if (
- protocols?.data?.data.find(protocol => protocol.id === run.protocolId)
- ?.protocolKind === 'quick-transfer'
- ) {
- return acc
} else {
return [...acc, run]
}
diff --git a/app/src/pages/ODD/RunSummary/index.tsx b/app/src/pages/ODD/RunSummary/index.tsx
index 8a6122a81b3..bda041abcc0 100644
--- a/app/src/pages/ODD/RunSummary/index.tsx
+++ b/app/src/pages/ODD/RunSummary/index.tsx
@@ -8,7 +8,6 @@ import {
RUN_STATUS_FAILED,
RUN_STATUS_STOPPED,
RUN_STATUS_SUCCEEDED,
- RUN_STATUSES_TERMINAL,
} from '@opentrons/api-client'
import {
ALIGN_CENTER,
@@ -43,6 +42,7 @@ import {
} from '@opentrons/react-api-client'
import { lastRunCommandPromptedErrorRecovery } from '/app/local-resources/commands'
+import { isTerminalRunStatus } from '/app/local-resources/runs/utils'
import { RunTimer } from '/app/molecules/RunTimer'
import { handleTipsAttachedModal } from '/app/organisms/DropTipWizardFlows'
import { RunFailedModal } from '/app/organisms/ODD/RunningProtocol'
@@ -126,11 +126,6 @@ export function RunSummary(): JSX.Element {
const localRobot = useSelector(getLocalRobot)
const robotName = localRobot?.name ?? 'no name'
const robotType = useRobotType(robotName)
- const onCloneRunSuccess = (): void => {
- if (isQuickTransfer) {
- deleteRun(runId)
- }
- }
const { trackProtocolRunEvent } = useTrackProtocolRunEvent(
runId,
@@ -146,7 +141,7 @@ export function RunSummary(): JSX.Element {
}
}, [isRunCurrent, enteredER])
- const { reset, isResetRunLoading } = useRunControls(runId, onCloneRunSuccess)
+ const { reset, isResetRunLoading } = useRunControls(runId)
const trackEvent = useTrackEvent()
const { trackEventWithRobotSerial } = useTrackEventWithRobotSerial()
@@ -177,11 +172,7 @@ export function RunSummary(): JSX.Element {
runId,
{ cursor: 0, pageLength: 100 },
{
- enabled:
- runStatus != null &&
- // @ts-expect-error runStatus expected to possibly not be terminal
- RUN_STATUSES_TERMINAL.includes(runStatus) &&
- isRunCurrent,
+ enabled: isTerminalRunStatus(runStatus) && isRunCurrent,
}
)
// TODO(jh, 08-14-24): The backend never returns the "user cancelled a run" error and cancelledWithoutRecovery becomes unnecessary.
diff --git a/app/src/pages/ODD/RunningProtocol/__tests__/RunningProtocol.test.tsx b/app/src/pages/ODD/RunningProtocol/__tests__/RunningProtocol.test.tsx
index 3b19178e7ae..c06146bc620 100644
--- a/app/src/pages/ODD/RunningProtocol/__tests__/RunningProtocol.test.tsx
+++ b/app/src/pages/ODD/RunningProtocol/__tests__/RunningProtocol.test.tsx
@@ -46,7 +46,6 @@ import {
useMostRecentCompletedAnalysis,
useNotifyAllCommandsQuery,
useNotifyRunQuery,
- useRunStatus,
useRunTimestamps,
} from '/app/resources/runs'
@@ -61,14 +60,14 @@ vi.mock('/app/redux-resources/robots')
vi.mock('/app/organisms/RunTimeControl/hooks')
vi.mock('/app/organisms/ODD/RunningProtocol')
vi.mock('/app/redux/discovery')
-vi.mock('/app/organisms/ODD/RunningProtocol/CancelingRunModal')
-vi.mock('/app/organisms/ODD/OpenDoorAlertModal')
vi.mock('/app/resources/runs')
vi.mock('/app/redux/config')
vi.mock('/app/organisms/ErrorRecoveryFlows')
vi.mock('/app/organisms/InterventionModal')
vi.mock('/app/organisms/DoorOpenControl/useIsDoorOpen')
vi.mock('/app/local-resources/images/hooks/useToastOnErrorImage')
+vi.mock('/app/organisms/ODD/RunningProtocol/CancelingRunModal')
+vi.mock('/app/organisms/ODD/OpenDoorAlertModal')
const RUN_ID = 'run_id'
const ROBOT_NAME = 'otie'
@@ -102,12 +101,16 @@ const render = (path = '/') => {
describe('RunningProtocol', () => {
beforeEach(() => {
when(vi.mocked(useNotifyRunQuery))
- .calledWith(RUN_ID, { staleTime: Infinity })
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
.thenReturn({
data: {
data: {
id: RUN_ID,
protocolId: PROTOCOL_ID,
+ status: RUN_STATUS_IDLE,
errors: [],
},
},
@@ -118,7 +121,6 @@ describe('RunningProtocol', () => {
.thenReturn({
trackProtocolRunEvent: vi.fn(),
})
- when(vi.mocked(useRunStatus)).calledWith(RUN_ID).thenReturn(RUN_STATUS_IDLE)
when(vi.mocked(useProtocolAnalysesQuery))
.calledWith(PROTOCOL_ID, { staleTime: Infinity }, expect.any(Boolean))
.thenReturn({
@@ -196,10 +198,26 @@ describe('RunningProtocol', () => {
expect(vi.mocked(RunningProtocolSkeleton)).toHaveBeenCalled()
})
it('should render the canceling run modal when run status is stop requested', () => {
- when(vi.mocked(useRunStatus))
- .calledWith(RUN_ID, { refetchInterval: 5000 })
- .thenReturn(RUN_STATUS_STOP_REQUESTED)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
+ .thenReturn({
+ key: PROTOCOL_KEY,
+ data: {
+ data: {
+ id: RUN_ID,
+ status: RUN_STATUS_STOP_REQUESTED,
+ protocol_id: PROTOCOL_KEY,
+ },
+ },
+ } as any)
+ vi.mocked(useProtocolQuery).mockReturnValue({
+ data: { data: { metadata: { protocolName: 'mock protocol name' } } },
+ } as any)
render(`/runs/${RUN_ID}/run`)
+
expect(vi.mocked(CancelingRunModal)).toHaveBeenCalled()
})
it('should render CurrentRunningProtocolCommand when loaded the data', () => {
@@ -207,13 +225,24 @@ describe('RunningProtocol', () => {
expect(vi.mocked(CurrentRunningProtocolCommand)).toHaveBeenCalled()
})
- it('should render open door alert modal, when run staus is blocked by open door', () => {
- when(vi.mocked(useRunStatus))
- .calledWith(RUN_ID, { refetchInterval: 5000 })
- .thenReturn(RUN_STATUS_BLOCKED_BY_OPEN_DOOR)
+ it('should render open door alert modal, when run status is blocked by open door', () => {
when(vi.mocked(useIsDoorOpen))
.calledWith(ROBOT_NAME)
.thenReturn(DOOR_RESULT)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
+ .thenReturn({
+ data: { data: { id: RUN_ID, status: RUN_STATUS_BLOCKED_BY_OPEN_DOOR } },
+ } as any)
+ when(vi.mocked(useIsDoorOpen))
+ .calledWith(ROBOT_NAME)
+ .thenReturn(DOOR_RESULT)
+ vi.mocked(useProtocolQuery).mockReturnValue({
+ data: { data: { metadata: { protocolName: 'mockProtocol' } } },
+ } as any)
render(`/runs/${RUN_ID}/run`)
expect(vi.mocked(OpenDoorAlertModal)).toHaveBeenCalledWith(
{ moduleDoorLocation: null },
@@ -222,9 +251,15 @@ describe('RunningProtocol', () => {
})
it('should render open stacker door alert modal, when run staus is blocked by open stacker door', () => {
- when(vi.mocked(useRunStatus))
- .calledWith(RUN_ID, { refetchInterval: 5000 })
- .thenReturn(RUN_STATUS_BLOCKED_BY_OPEN_DOOR)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
+ .thenReturn({
+ data: { data: { id: RUN_ID, status: RUN_STATUS_BLOCKED_BY_OPEN_DOOR } },
+ } as any)
+
const mockOpenStacker = {
isDoorOpen: true,
moduleDoorLocation: 'A4',
@@ -232,6 +267,9 @@ describe('RunningProtocol', () => {
when(vi.mocked(useIsDoorOpen))
.calledWith(ROBOT_NAME)
.thenReturn(mockOpenStacker)
+ vi.mocked(useProtocolQuery).mockReturnValue({
+ data: { data: { metadata: { protocolName: 'mockProtocol' } } },
+ } as any)
render(`/runs/${RUN_ID}/run`)
expect(vi.mocked(OpenDoorAlertModal)).toHaveBeenCalledWith(
{ moduleDoorLocation: mockOpenStacker.moduleDoorLocation },
@@ -240,9 +278,15 @@ describe('RunningProtocol', () => {
})
it('should render open unconfigured stacker door alert modal, when run staus is blocked by open stacker door not in the deck config', () => {
- when(vi.mocked(useRunStatus))
- .calledWith(RUN_ID, { refetchInterval: 5000 })
- .thenReturn(RUN_STATUS_BLOCKED_BY_OPEN_DOOR)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
+ .thenReturn({
+ data: { data: { id: RUN_ID, status: RUN_STATUS_BLOCKED_BY_OPEN_DOOR } },
+ } as any)
+
const mockUnconfiguredOpenStacker = {
isDoorOpen: true,
moduleDoorLocation: NOT_CONFIGURED,
@@ -250,6 +294,9 @@ describe('RunningProtocol', () => {
when(vi.mocked(useIsDoorOpen))
.calledWith(ROBOT_NAME)
.thenReturn(mockUnconfiguredOpenStacker)
+ vi.mocked(useProtocolQuery).mockReturnValue({
+ data: { data: { metadata: { protocolName: 'mockProtocol' } } },
+ } as any)
render(`/runs/${RUN_ID}/run`)
expect(vi.mocked(OpenDoorAlertModal)).toHaveBeenCalledWith(
{ moduleDoorLocation: NOT_CONFIGURED },
@@ -258,24 +305,43 @@ describe('RunningProtocol', () => {
})
it(`should render not open door alert modal, when run status is ${RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR}`, () => {
- when(vi.mocked(useRunStatus))
- .calledWith(RUN_ID, { refetchInterval: 5000 })
- .thenReturn(RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
+ .thenReturn({
+ data: {
+ data: {
+ id: RUN_ID,
+ status: RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
+ },
+ },
+ } as any)
+ vi.mocked(useProtocolQuery).mockReturnValue({
+ data: { data: { metadata: { protocolName: 'mockProtocol' } } },
+ } as any)
render(`/runs/${RUN_ID}/run`)
expect(vi.mocked(OpenDoorAlertModal)).not.toHaveBeenCalled()
})
it(`should display a Run Paused splash screen if the run status is "${RUN_STATUS_AWAITING_RECOVERY}"`, () => {
- when(vi.mocked(useRunStatus))
- .calledWith(RUN_ID, { refetchInterval: 5000 })
- .thenReturn(RUN_STATUS_AWAITING_RECOVERY)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(RUN_ID, {
+ staleTime: Infinity,
+ refetchInterval: 5000,
+ })
+ .thenReturn({
+ data: { data: { id: RUN_ID, status: RUN_STATUS_AWAITING_RECOVERY } },
+ } as any)
+ vi.mocked(useProtocolQuery).mockReturnValue({
+ data: { data: { metadata: { protocolName: 'mockProtocol' } } },
+ } as any)
render(`/runs/${RUN_ID}/run`)
})
it('should render ErrorRecovery appropriately', () => {
- render(`/runs/${RUN_ID}/run`)
expect(screen.queryByText('MOCK ERROR RECOVERY')).not.toBeInTheDocument()
-
vi.mocked(useErrorRecoveryFlows).mockReturnValue({
isERActive: true,
failedCommand: {} as any,
diff --git a/app/src/pages/ODD/RunningProtocol/index.tsx b/app/src/pages/ODD/RunningProtocol/index.tsx
index 9d2004f49d5..45ddae2698b 100644
--- a/app/src/pages/ODD/RunningProtocol/index.tsx
+++ b/app/src/pages/ODD/RunningProtocol/index.tsx
@@ -49,7 +49,6 @@ import {
useLastRunCommand,
useMostRecentCompletedAnalysis,
useNotifyRunQuery,
- useRunStatus,
useRunTimestamps,
} from '/app/resources/runs'
@@ -61,8 +60,8 @@ import type {
RunningProtocolCommandListProps,
} from '/app/organisms/ODD/RunningProtocol'
-const RUN_STATUS_REFETCH_INTERVAL = 5000
const LIVE_RUN_COMMANDS_POLL_MS = 3000
+const RUN_STATUS_REFETCH_INTERVAL = 5000
export type ScreenOption =
| 'CurrentRunningProtocolCommand'
@@ -95,15 +94,19 @@ export function RunningProtocol(): JSX.Element {
const currentRunCommandIndex = robotSideAnalysis?.commands.findIndex(
c => c.key === lastRunCommand?.key
)
- const runStatus = useRunStatus(runId, {
+
+ const { startedAt, stoppedAt, completedAt } = useRunTimestamps(runId)
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ staleTime: Infinity,
refetchInterval: RUN_STATUS_REFETCH_INTERVAL,
})
- const { startedAt, stoppedAt, completedAt } = useRunTimestamps(runId)
- const { data: runRecord } = useNotifyRunQuery(runId, { staleTime: Infinity })
+ const runStatus = runRecord?.data.status ?? null
+
const protocolId = runRecord?.data.protocolId ?? null
const { data: protocolRecord } = useProtocolQuery(protocolId, {
staleTime: Infinity,
})
+
const protocolName =
protocolRecord?.data.metadata.protocolName ??
protocolRecord?.data.files[0].name
diff --git a/app/src/redux/shell/remote.ts b/app/src/redux/shell/remote.ts
index 5475ce2de0a..7541255ce8e 100644
--- a/app/src/redux/shell/remote.ts
+++ b/app/src/redux/shell/remote.ts
@@ -61,6 +61,15 @@ export async function appShellRequestor(
if (result?.error != null) {
throw result.error
}
+
+ // Blob data doesn't serialize properly across the IPC, so we parse it from
+ // an Array type sent from the shell layer.
+ if (config.responseType === 'blob' && Array.isArray(result.data)) {
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+ const uint8Array = new Uint8Array(result.data)
+ result.data = new Blob([uint8Array]) as Data
+ }
+
return result
}
diff --git a/app/src/redux/shell/types.ts b/app/src/redux/shell/types.ts
index 5d402abe3ff..f9e403b3343 100644
--- a/app/src/redux/shell/types.ts
+++ b/app/src/redux/shell/types.ts
@@ -222,7 +222,7 @@ export interface StepDetailViewerUpdateAction {
type: 'shell:STEP_DETAIL_VIEWER_UPDATE'
payload: {
protocolKey: string
- slot: string
+ slot: string | null
command: RunTimeCommand
robotState: RobotState
invariantContext: InvariantContext
diff --git a/app/src/resources/runs/__tests__/useRunHasStarted.test.tsx b/app/src/resources/runs/__tests__/useRunHasStarted.test.tsx
index e34dda06db5..36ee284008b 100644
--- a/app/src/resources/runs/__tests__/useRunHasStarted.test.tsx
+++ b/app/src/resources/runs/__tests__/useRunHasStarted.test.tsx
@@ -4,36 +4,62 @@ import { when } from 'vitest-when'
import { RUN_STATUS_IDLE, RUN_STATUS_RUNNING } from '@opentrons/api-client'
-import { useRunStatus } from '/app/resources/runs'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useNotifyRunQuery,
+} from '/app/resources/runs'
import { useRunHasStarted } from '../useRunHasStarted'
-vi.mock('/app/resources/runs')
+import type { UseQueryResult } from 'react-query'
+import type { Run } from '@opentrons/api-client'
+
+vi.mock('../useNotifyRunQuery')
const MOCK_RUN_ID = '1'
describe('useRunHasStarted', () => {
beforeEach(() => {
- when(vi.mocked(useRunStatus)).calledWith(null).thenReturn(null)
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(null, { refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL })
+ .thenReturn({ data: null } as any)
})
it('should return false when no run id is provided', () => {
const { result } = renderHook(() => useRunHasStarted(null))
+
expect(result.current).toEqual(false)
})
it('should return false when run has not started', () => {
- when(vi.mocked(useRunStatus))
- .calledWith(MOCK_RUN_ID)
- .thenReturn(RUN_STATUS_IDLE)
+ const idleRun = {
+ current: true,
+ id: MOCK_RUN_ID,
+ status: RUN_STATUS_IDLE,
+ }
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(MOCK_RUN_ID, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({ data: { data: idleRun } } as UseQueryResult)
const { result } = renderHook(() => useRunHasStarted(MOCK_RUN_ID))
expect(result.current).toEqual(false)
})
it('should return true when run has started', () => {
- when(vi.mocked(useRunStatus))
- .calledWith(MOCK_RUN_ID)
- .thenReturn(RUN_STATUS_RUNNING)
+ const runningRun = {
+ current: true,
+ id: MOCK_RUN_ID,
+ status: RUN_STATUS_RUNNING,
+ }
+ when(vi.mocked(useNotifyRunQuery))
+ .calledWith(MOCK_RUN_ID, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ .thenReturn({ data: { data: runningRun } } as UseQueryResult<
+ Run,
+ unknown
+ >)
const { result } = renderHook(() => useRunHasStarted(MOCK_RUN_ID))
expect(result.current).toEqual(true)
})
diff --git a/app/src/resources/runs/__tests__/useRunStatus.test.ts b/app/src/resources/runs/__tests__/useRunStatus.test.ts
deleted file mode 100644
index 1d50ea6b8e8..00000000000
--- a/app/src/resources/runs/__tests__/useRunStatus.test.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-import { renderHook } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-import { when } from 'vitest-when'
-
-import {
- mockIdleStartedRun,
- mockIdleUnstartedRun,
- mockRunningRun,
- RUN_ID_2,
-} from '../__fixtures__'
-import { useNotifyRunQuery } from '../useNotifyRunQuery'
-import { useRunStatus } from '../useRunStatus'
-
-import type { UseQueryResult } from 'react-query'
-import type { Run } from '@opentrons/api-client'
-
-vi.mock('../useNotifyRunQuery')
-
-describe('useRunStatus hook', () => {
- it('returns the run status of the run', async () => {
- when(useNotifyRunQuery)
- .calledWith(RUN_ID_2, expect.any(Object))
- .thenReturn({
- data: { data: mockRunningRun },
- } as unknown as UseQueryResult)
-
- const { result } = renderHook(() => useRunStatus(RUN_ID_2))
- expect(result.current).toBe('running')
- })
-
- it('returns a "idle" run status if idle and run unstarted', () => {
- when(useNotifyRunQuery)
- .calledWith(RUN_ID_2, expect.any(Object))
- .thenReturn({
- data: { data: mockIdleUnstartedRun },
- } as unknown as UseQueryResult)
-
- const { result } = renderHook(() => useRunStatus(RUN_ID_2))
- expect(result.current).toBe('idle')
- })
-
- it('returns a "running" run status if idle and run started', () => {
- when(useNotifyRunQuery)
- .calledWith(RUN_ID_2, expect.any(Object))
- .thenReturn({
- data: { data: mockIdleStartedRun },
- } as unknown as UseQueryResult)
-
- const { result } = renderHook(() => useRunStatus(RUN_ID_2))
- expect(result.current).toBe('running')
- })
-})
diff --git a/app/src/resources/runs/__tests__/useRunStatuses.test.tsx b/app/src/resources/runs/__tests__/useRunStatuses.test.tsx
index edf45065bba..634ca83846b 100644
--- a/app/src/resources/runs/__tests__/useRunStatuses.test.tsx
+++ b/app/src/resources/runs/__tests__/useRunStatuses.test.tsx
@@ -16,21 +16,27 @@ import {
} from '@opentrons/api-client'
import { useCurrentRunId } from '../useCurrentRunId'
-import { useRunStatus } from '../useRunStatus'
+import { useNotifyRunQuery } from '../useNotifyRunQuery'
import { useRunStatuses } from '../useRunStatuses'
vi.mock('../useCurrentRunId')
-vi.mock('../useRunStatus')
+vi.mock('../useNotifyRunQuery')
+
+const mockRunStatus = (status: any) =>
+ vi.mocked(useNotifyRunQuery).mockReturnValue({
+ data: { data: { status } },
+ } as any)
describe('useRunStatuses', () => {
beforeEach(() => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_RUNNING)
- vi.mocked(useCurrentRunId).mockReturnValue('123')
+ mockRunStatus(RUN_STATUS_RUNNING)
+ vi.mocked(useCurrentRunId).mockReturnValue('test_id_running')
})
it('returns everything as false when run status is null', () => {
- vi.mocked(useRunStatus).mockReturnValue(null)
+ vi.mocked(useNotifyRunQuery).mockReturnValue({ data: null } as any)
const result = useRunStatuses()
+
expect(result).toStrictEqual({
isRunRunning: false,
isRunStill: false,
@@ -40,7 +46,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunStill and Terminal when run status is ${RUN_STATUS_SUCCEEDED}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_SUCCEEDED)
+ mockRunStatus(RUN_STATUS_SUCCEEDED)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: false,
@@ -51,7 +57,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunStill and Terminal when run status is ${RUN_STATUS_STOPPED}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_STOPPED)
+ mockRunStatus(RUN_STATUS_STOPPED)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: false,
@@ -62,7 +68,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunStill and Terminal when run status is ${RUN_STATUS_FAILED}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_FAILED)
+ mockRunStatus(RUN_STATUS_FAILED)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: false,
@@ -73,7 +79,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunStill and isRunIdle when run status is ${RUN_STATUS_IDLE}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_IDLE)
+ mockRunStatus(RUN_STATUS_IDLE)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: false,
@@ -84,7 +90,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_RUNNING}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_RUNNING)
+ mockRunStatus(RUN_STATUS_RUNNING)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -95,7 +101,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_PAUSED}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_PAUSED)
+ mockRunStatus(RUN_STATUS_PAUSED)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -106,7 +112,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_AWAITING_RECOVERY}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_AWAITING_RECOVERY)
+ mockRunStatus(RUN_STATUS_AWAITING_RECOVERY)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -117,7 +123,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_AWAITING_RECOVERY_PAUSED}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_AWAITING_RECOVERY_PAUSED)
+ mockRunStatus(RUN_STATUS_AWAITING_RECOVERY_PAUSED)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -128,7 +134,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_STOP_REQUESTED}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_STOP_REQUESTED)
+ mockRunStatus(RUN_STATUS_STOP_REQUESTED)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -139,7 +145,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_FINISHING}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_FINISHING)
+ mockRunStatus(RUN_STATUS_FINISHING)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -150,7 +156,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_BLOCKED_BY_OPEN_DOOR}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_BLOCKED_BY_OPEN_DOOR)
+ mockRunStatus(RUN_STATUS_BLOCKED_BY_OPEN_DOOR)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
@@ -161,9 +167,7 @@ describe('useRunStatuses', () => {
})
it(`returns true isRunRunning when status is ${RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR}`, () => {
- vi.mocked(useRunStatus).mockReturnValue(
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR
- )
+ mockRunStatus(RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR)
const result = useRunStatuses()
expect(result).toStrictEqual({
isRunRunning: true,
diff --git a/app/src/resources/runs/index.ts b/app/src/resources/runs/index.ts
index 18a48fd533e..be2ff0ff3d9 100644
--- a/app/src/resources/runs/index.ts
+++ b/app/src/resources/runs/index.ts
@@ -10,7 +10,6 @@ export * from './useProtocolDetailsForRun'
export * from './useCurrentRun'
export * from './useRunTimestamps'
export * from './useRunCommands'
-export * from './useRunStatus'
export * from './useCloneRun'
export * from './useCloseCurrentRun'
export * from './useCurrentRunCommands'
diff --git a/app/src/resources/runs/useLastRunCommand.ts b/app/src/resources/runs/useLastRunCommand.ts
index a62a34bc6ea..e19acb5393c 100644
--- a/app/src/resources/runs/useLastRunCommand.ts
+++ b/app/src/resources/runs/useLastRunCommand.ts
@@ -1,6 +1,10 @@
import { RUN_STATUSES_TERMINAL } from '@opentrons/api-client'
-import { useNotifyAllCommandsQuery, useRunStatus } from '/app/resources/runs'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useNotifyAllCommandsQuery,
+ useNotifyRunQuery,
+} from '/app/resources/runs'
import type { UseQueryOptions } from 'react-query'
import type {
@@ -15,7 +19,10 @@ export function useLastRunCommand(
runId: string,
options: UseQueryOptions = {}
): RunCommandSummary | null {
- const runStatus = useRunStatus(runId)
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
const { data: commandsData } = useNotifyAllCommandsQuery(
runId,
{ pageLength: 1 },
diff --git a/app/src/resources/runs/useRunHasStarted.ts b/app/src/resources/runs/useRunHasStarted.ts
index 8472c62d31f..8f438787b46 100644
--- a/app/src/resources/runs/useRunHasStarted.ts
+++ b/app/src/resources/runs/useRunHasStarted.ts
@@ -1,9 +1,14 @@
import { RUN_STATUS_IDLE } from '@opentrons/api-client'
-import { useRunStatus } from '/app/resources/runs'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useNotifyRunQuery,
+} from '/app/resources/runs'
export function useRunHasStarted(runId: string | null): boolean {
- const runStatus = useRunStatus(runId)
-
- return runStatus != null && runStatus !== RUN_STATUS_IDLE
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
+ return runStatus != null && !(runStatus === RUN_STATUS_IDLE)
}
diff --git a/app/src/resources/runs/useRunStatus.ts b/app/src/resources/runs/useRunStatus.ts
deleted file mode 100644
index c65c8542171..00000000000
--- a/app/src/resources/runs/useRunStatus.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import {
- RUN_ACTION_TYPE_PLAY,
- RUN_STATUS_IDLE,
- RUN_STATUS_RUNNING,
-} from '@opentrons/api-client'
-
-import { DEFAULT_STATUS_REFETCH_INTERVAL } from './constants'
-import { useNotifyRunQuery } from './useNotifyRunQuery'
-
-import type { UseQueryOptions } from 'react-query'
-import type { Run, RunStatus } from '@opentrons/api-client'
-
-/**
- * @deprecated TODO(jh, 05-05-24): Confirming MM's observation, this hook is no longer necessary
- * and appears bug-prone. Let's remove it and replace with useNotifyRunQuery.
- */
-export function useRunStatus(
- runId: string | null,
- options?: UseQueryOptions
-): RunStatus | null {
- const { data } = useNotifyRunQuery(runId ?? null, {
- refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
- ...options,
- })
-
- const runStatus = data?.data?.status!
-
- const actions = data?.data?.actions!
- const firstPlay = actions?.find(
- action => action.actionType === RUN_ACTION_TYPE_PLAY
- )
- const runStartTime = firstPlay?.createdAt
-
- // display an idle status as 'running' in the UI after a run has started.
- // todo(mm, 2024-06-24): This may not be necessary anymore. It looks like it was
- // working around prior (?) server behavior where a run's status would briefly flicker
- // to idle in between commands.
- const adjustedRunStatus: RunStatus | null =
- runStatus === RUN_STATUS_IDLE && runStartTime != null
- ? RUN_STATUS_RUNNING
- : runStatus
-
- return adjustedRunStatus
-}
diff --git a/app/src/resources/runs/useRunStatuses.ts b/app/src/resources/runs/useRunStatuses.ts
index 896b7ddff8e..a595fd1c485 100644
--- a/app/src/resources/runs/useRunStatuses.ts
+++ b/app/src/resources/runs/useRunStatuses.ts
@@ -1,19 +1,14 @@
-import {
- RUN_STATUS_AWAITING_RECOVERY,
- RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_AWAITING_RECOVERY_PAUSED,
- RUN_STATUS_BLOCKED_BY_OPEN_DOOR,
- RUN_STATUS_FINISHING,
- RUN_STATUS_IDLE,
- RUN_STATUS_PAUSED,
- RUN_STATUS_RUNNING,
- RUN_STATUS_STOP_REQUESTED,
- RUN_STATUSES_TERMINAL,
-} from '@opentrons/api-client'
-
-import { useCurrentRunId, useRunStatus } from '/app/resources/runs'
+import { RUN_STATUS_IDLE } from '@opentrons/api-client'
-import type { RunStatus } from '@opentrons/api-client'
+import {
+ isRunningStatus,
+ isTerminalRunStatus,
+} from '/app/local-resources/runs/utils'
+import {
+ DEFAULT_STATUS_REFETCH_INTERVAL,
+ useCurrentRunId,
+ useNotifyRunQuery,
+} from '/app/resources/runs'
interface RunStatusesInfo {
isRunStill: boolean
@@ -24,22 +19,14 @@ interface RunStatusesInfo {
export function useRunStatuses(): RunStatusesInfo {
const currentRunId = useCurrentRunId()
- const runStatus = useRunStatus(currentRunId)
+ const { data: runRecord } = useNotifyRunQuery(currentRunId, {
+ refetchInterval: DEFAULT_STATUS_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
const isRunIdle = runStatus === RUN_STATUS_IDLE
- const isRunRunning =
- runStatus === RUN_STATUS_PAUSED ||
- runStatus === RUN_STATUS_RUNNING ||
- runStatus === RUN_STATUS_AWAITING_RECOVERY ||
- runStatus === RUN_STATUS_AWAITING_RECOVERY_PAUSED ||
- runStatus === RUN_STATUS_STOP_REQUESTED ||
- runStatus === RUN_STATUS_FINISHING ||
- runStatus === RUN_STATUS_BLOCKED_BY_OPEN_DOOR ||
- runStatus === RUN_STATUS_AWAITING_RECOVERY_BLOCKED_BY_OPEN_DOOR
- const isRunTerminal =
- runStatus != null
- ? (RUN_STATUSES_TERMINAL as RunStatus[]).includes(runStatus)
- : false
- const isRunStill = isRunTerminal || isRunIdle
+ const isRunRunning = isRunningStatus(runStatus)
+ const isRunTerminal = isTerminalRunStatus(runStatus)
+ const isRunStill = isRunIdle || isTerminalRunStatus(runStatus)
return { isRunStill, isRunTerminal, isRunIdle, isRunRunning }
}
diff --git a/app/src/resources/runs/useRunTimestamps.ts b/app/src/resources/runs/useRunTimestamps.ts
index 6a95f2e88fc..849e077e56f 100644
--- a/app/src/resources/runs/useRunTimestamps.ts
+++ b/app/src/resources/runs/useRunTimestamps.ts
@@ -14,7 +14,6 @@ import {
import { DEFAULT_RUN_QUERY_REFETCH_INTERVAL } from './constants'
import { useNotifyRunQuery } from './useNotifyRunQuery'
import { useRunCommands } from './useRunCommands'
-import { useRunStatus } from './useRunStatus'
export interface RunTimestamps {
startedAt: string | null
@@ -24,11 +23,12 @@ export interface RunTimestamps {
}
export function useRunTimestamps(runId: string | null): RunTimestamps {
- const runStatus = useRunStatus(runId)
- const { actions = [], errors = [] } =
- useNotifyRunQuery(runId, {
- refetchInterval: DEFAULT_RUN_QUERY_REFETCH_INTERVAL,
- })?.data?.data ?? {}
+ const { data: runRecord } = useNotifyRunQuery(runId, {
+ refetchInterval: DEFAULT_RUN_QUERY_REFETCH_INTERVAL,
+ })
+ const runStatus = runRecord?.data.status ?? null
+ const actions = runRecord?.data.actions ?? null
+ const errors = runRecord?.data.errors ?? null
const runCommands =
useRunCommands(
runId,
@@ -44,7 +44,7 @@ export function useRunTimestamps(runId: string | null): RunTimestamps {
}
) ?? []
- const firstPlay = actions.find(
+ const firstPlay = actions?.find(
action => action.actionType === RUN_ACTION_TYPE_PLAY
)
const lastAction = last(actions)
diff --git a/components/src/assets/localization/en/protocol_command_text.json b/components/src/assets/localization/en/protocol_command_text.json
index e34b2dc8449..479e3223038 100644
--- a/components/src/assets/localization/en/protocol_command_text.json
+++ b/components/src/assets/localization/en/protocol_command_text.json
@@ -93,6 +93,7 @@
"pickup_tip": "Picking up tip(s) from {{well_range}} of {{labware}} in {{labware_location}}",
"prepare_to_aspirate": "Preparing {{pipette}} to aspirate",
"pressurizing_to_dispense": "Pressurize pipette to dispense {{volume}} µL from resin tip at {{flow_rate}} µL/sec",
+ "quantity": "Quantity: {{count}}",
"reloading_labware": "Reloading {{labware}}",
"return_tip": "Returning tip to {{well_name}} of {{labware}} in {{labware_location}}",
"right": "Right",
diff --git a/components/src/assets/localization/zh/protocol_command_text.json b/components/src/assets/localization/zh/protocol_command_text.json
index 19f6dd5490e..2d6acc6271b 100644
--- a/components/src/assets/localization/zh/protocol_command_text.json
+++ b/components/src/assets/localization/zh/protocol_command_text.json
@@ -8,16 +8,26 @@
"adapter_in_slot": "{{adapter}}在{{slot}}上",
"air_gap_in_place": "正在形成 {{volume}} µL 的空气间隙",
"all_nozzles": "所有移液喷嘴",
- "aspirate": "从{{labware_location}}的{{labware}}的{{well_name}}孔中以{{flow_rate}}µL/秒的速度吸液{{volume}}µL",
- "aspirate_in_place": "在原位以{{flow_rate}}µL/秒的速度吸液{{volume}}µL",
- "blowout": "在{{labware_location}}的{{labware}}的{{well_name}}孔中以{{flow_rate}}µL/秒的速度排空",
- "blowout_in_place": "在原位以{{flow_rate}}µL/秒的速度排空",
+ "aspirate": "从{{labware_location}}的{{labware}}的{{well_name}}孔中以{{flow_rate}}µL/s的速度吸液{{volume}}µL",
+ "aspirate_in_place": "在原位以{{flow_rate}}µL/s的速度吸液{{volume}}µL",
+ "aspirate_while_tracking": "在 {{labware_location}} 的 {{labware}} 的孔位 {{well_name}} 的 {{track_from_location}} 和 {{track_to_location}} 之间以 {{flow_rate}} µL/秒的速度吸取 {{volume}} µL。",
+ "blowout": "在{{labware_location}}的{{labware}}的{{well_name}}孔中以{{flow_rate}}µL/s的速度排空",
+ "blowout_in_place": "在原位以{{flow_rate}}µL/s的速度排空",
+ "capture_image_brightness": "{{brightness}}% 亮度",
+ "capture_image_contrast": "{{contrast}}% 对比度",
+ "capture_image_list_separator": "，",
+ "capture_image_resolution": "{{width}}x{{height}} 分辨率",
+ "capture_image_saturation": "{{saturation}}% 饱和度",
+ "capture_image_simple": "正在拍摄图像。",
+ "capture_image_with_options": "使用 {{options}} 拍摄图像。",
+ "capture_image_zoom": "{{zoom}}X 变焦",
"closing_tc_lid": "关闭热循环仪热盖",
"column_layout": "列布局",
"comment": "解释",
"configure_for_volume": "配置{{pipette}}以吸液{{volume}}µL",
"configure_nozzle_layout": "配置{{pipette}}以使用{{amount}}个通道",
"confirm_and_resume": "确认并继续",
+ "create_timer": "创建一个 {{seconds}} 秒的后台计时器",
"deactivate_hs_shake": "停用震荡功能",
"deactivate_temperature_module": "停用温控模块",
"deactivating_hs_heater": "停用加热功能",
@@ -26,26 +36,27 @@
"degrees_c": "{{temp}}°C",
"detect_liquid_presence": "正在检测{{labware}}在{{labware_location}}中的{{well_name}}孔中的液体存在",
"disengaging_magnetic_module": "下降磁力架模块",
- "dispense": "以{{flow_rate}}µL/秒的速度将{{volume}}µL 排液至{{labware_location}}的{{labware}}的{{well_name}}孔中",
- "dispense_in_place": "在原位以{{flow_rate}}µL/秒的速度排液{{volume}}µL",
- "dispense_push_out": "以{{flow_rate}}µL/秒的速度将{{volume}}µL 排液至{{labware_location}}的{{labware}}的{{well_name}}孔中，并推出{{push_out_volume}}µL",
+ "dispense": "以{{flow_rate}}µL/s的速度将{{volume}}µL 排液至{{labware_location}}的{{labware}}的{{well_name}}孔中",
+ "dispense_in_place": "在原位以{{flow_rate}}µL/s的速度排液{{volume}}µL",
+ "dispense_push_out": "以{{flow_rate}}µL/s的速度将{{volume}}µL 排液至{{labware_location}}的{{labware}}的{{well_name}}孔中，并推出{{push_out_volume}}µL",
+ "dispense_while_tracking": "在 {{labware_location}} 的 {{labware}} 中，从孔位的{{track_from_location}} 到 {{track_to_location}} {{well_name}}处，以 {{flow_rate}} µL/秒的速度排出 {{volume}} µL",
"drop_tip": "将吸头丢入{{labware}}的{{well_name}}孔中",
"drop_tip_in_place": "在原位丢弃吸头",
"dropping_tip_in_trash": "将吸头丢入{{trash}}",
"empty_stacker": "空的外置堆栈",
"engaging_magnetic_module": "抬升磁力架模块",
- "extension_jaw": "延伸钳口",
- "extension_mount": "安装支架拓展位",
+ "extension_jaw": "转板抓手",
+ "extension_mount": "支架拓展位",
"extension_z": "拓展 Z",
- "fill_stacker": "填补外置堆栈",
+ "fill_stacker": "填充外置堆栈",
"fixed_trash": "垃圾桶",
"get_next_tip": "计算下一个可用吸头的位置",
"home_gantry": "复位所有龙门架、移液器和柱塞轴",
"in_location": "在{{location}}",
"latching_hs_latch": "在热震荡模块上锁定实验耗材",
"left": "左",
- "left_mount": "左侧",
- "left_plunger": "左侧柱塞",
+ "left_mount": "左侧安装支架",
+ "left_plunger": "左侧推杆",
"left_z": "左 Z",
"load_labware_to_display_location": "{{display_location}}加载{{labware}}",
"load_lid": "加载PCR上盖",
@@ -68,8 +79,9 @@
"move_to_addressable_area_drop_tip": "移动到{{addressable_area}}",
"move_to_coordinates": "移动到 (X:{{x}}, Y:{{y}}, Z:{{z}})",
"move_to_slot": "移动到{{slot_name}}号板位",
- "move_to_well": "移动到好 {{well_name}} 的 {{labware}} 在 {{labware_location}}",
+ "move_to_well": "正在移动到{{displayLocation}}中{{labware}}的{{wellName}}孔的{{positionRelative}}的偏移 X {{xOffset}} Y {{yOffset}} Z {{zOffset}}",
"multiple": "多个",
+ "ninety_six_channel_cam": "吸头齿条夹持结构",
"notes": "备注",
"off_deck": "甲板外",
"offdeck": "甲板外",
@@ -80,35 +92,40 @@
"pause_on": "在{{robot_name}}上暂停",
"pickup_tip": "从{{labware_location}}的{{labware}}的{{well_range}}孔中拾取吸头",
"prepare_to_aspirate": "准备使用{{pipette}}吸液",
- "pressurizing_to_dispense": "加压移液器进行分配 {{volume}} µL 距离树脂尖端 {{flow_rate}} 微升/秒",
+ "pressurizing_to_dispense": "加压移液器进行分配 {{volume}} µL 距离树脂尖端 {{flow_rate}} µL/s",
"reloading_labware": "正在重新加载{{labware}}",
"return_tip": "将吸头返回到{{labware_location}}的{{labware}}的{{well_name}}孔中",
"right": "右",
- "right_mount": "右侧",
- "right_plunger": "右侧柱塞",
+ "right_mount": "右侧安装支架",
+ "right_plunger": "右侧推杆",
"right_z": "右 Z",
"robot_close_gripper_jaw": "设备转板抓手抓取中",
- "robot_move_axes_relative": "设备移动{{displacement}}",
- "robot_move_axes_to": "将设备移动到 {{position}}",
- "robot_move_to": "移动 {{mount}} 至 (X: {{x}}，Y： {{y}}，Z： {{z}})",
+ "robot_move_axes_relative": "设备移动 {{displacement}}",
+ "robot_move_axes_to": "设备移动到 {{position}}",
+ "robot_move_to": "移动{{mount}}至(X: {{x}}, Y: {{y}}, Z: {{z}})",
"robot_open_gripper_jaw": "设备转板抓手打开中",
"row_layout": "行布局",
"save_position": "保存位置",
"sealing_to_location": "密封至 {{labware}} 在 {{location}}",
"set_and_await_hs_shake": "设置热震荡模块以{{rpm}}rpm 震动并等待达到该转速",
+ "set_hs_shake": "将加热振荡器设置为以 {{rpm}} 转速震动",
+ "set_tip_state": "将 {{labware}} 中的吸头设置为 {{tip_well_state}} 状态",
"setting_hs_temp": "将热震荡模块的目标温度设置为{{temp}}",
"setting_temperature_module_temp": "将温控模块设置为{{temp}}（四舍五入到最接近的整数）",
- "setting_thermocycler_block_temp": "将热循环仪加热块温度设置为{{temp}}，并在达到目标后保持{{hold_time_seconds}}秒",
+ "setting_thermocycler_block_temp": "将热循环仪加热块温度设置为{{temp}}，并在达到目标后保持{{hold_time_seconds}}s",
+ "setting_thermocycler_block_temp_in_background": "在后台将热循环模块加热平台的温度设置为 {{temp}}",
"setting_thermocycler_lid_temp": "将热循环仪热盖温度设置为{{temp}}",
+ "setting_thermocycler_lid_temp_in_background": "在后台将热循环仪上盖的温度设置为 {{temp}}",
"single": "单个",
"single_nozzle_layout": "单个移液喷嘴布局",
"slot": "板位{{slot_name}}",
"stacker_hopper_display": "外置堆栈 {{row}}",
"target_temperature": "目标温度",
"tc_awaiting_for_duration": "等待热循环仪程序完成",
- "tc_run_profile_steps": "温度：{{celsius}}°C，时间：{{seconds}}秒",
+ "tc_run_profile_steps": "温度：{{celsius}}°C，时间：{{seconds}}s",
"tc_starting_extended_profile": "运行热循环仪程序，共有{{elementCount}}个步骤和循环：",
"tc_starting_extended_profile_cycle": "以下步骤重复{{repetitions}}次：",
+ "tc_starting_extended_profile_in_background": "在后台运行热循环仪的程序，共有 {{elementCount}} 步和循环：",
"tc_starting_profile": "热循环仪开始进行由以下步骤组成的{{repetitions}}次循环：",
"touch_tip": "吸头接触内壁",
"trash_bin": "垃圾桶",
@@ -117,13 +134,14 @@
"turning_rail_lights_on": "正在打开导轨灯",
"unlatching_hs_latch": "解锁热震荡模块上的实验耗材",
"unsealing_from_location": "解除封印 {{labware}} 在 {{location}}",
- "wait_for_duration": "暂停{{seconds}}秒。{{message}}",
+ "wait_for_duration": "暂停{{seconds}}s。{{message}}",
"wait_for_resume": "暂停协议",
+ "wait_for_tasks": "等待任务列表完成",
"waiting_for_hs_to_reach": "等待热震荡模块达到目标温度",
"waiting_for_tc_block_to_reach": "等待热循环仪加热块达到目标温度并保持指定时间",
"waiting_for_tc_lid_to_reach": "等待热循环仪热盖达到目标温度",
"waiting_to_reach_temp_module": "等待温控模块达到{{temp}}",
"waste_chute": "外置垃圾槽",
- "with_lid_name": " 和 {{lidDisplayName}}",
+ "with_lid_name": "与 {{lidDisplayName}}",
"with_reference_of": "以{{wavelength}} nm为基准"
}
diff --git a/components/src/hardware-sim/BaseDeck/BaseDeck.stories.tsx b/components/src/hardware-sim/BaseDeck/BaseDeck.stories.tsx
index 20611710d95..21c8a47f156 100644
--- a/components/src/hardware-sim/BaseDeck/BaseDeck.stories.tsx
+++ b/components/src/hardware-sim/BaseDeck/BaseDeck.stories.tsx
@@ -65,23 +65,23 @@ export const BaseDeck: Story = {
{
moduleLocation: { slotName: 'B1' },
moduleModel: THERMOCYCLER_MODULE_V2,
- nestedLabwareDef: fixture96Plate as LabwareDefinition,
+ nestedLabwareDefsBottomToTop: fixture96Plate as LabwareDefinition,
innerProps: { lidMotorState: 'open' },
},
{
moduleLocation: { slotName: 'D1' },
moduleModel: TEMPERATURE_MODULE_V2,
- nestedLabwareDef: fixture96Plate as LabwareDefinition,
+ nestedLabwareDefsBottomToTop: fixture96Plate as LabwareDefinition,
},
{
moduleLocation: { slotName: 'B3' },
moduleModel: HEATERSHAKER_MODULE_V1,
- nestedLabwareDef: fixture96Plate as LabwareDefinition,
+ nestedLabwareDefsBottomToTop: fixture96Plate as LabwareDefinition,
},
{
moduleLocation: { slotName: 'D2' },
moduleModel: MAGNETIC_BLOCK_V1,
- nestedLabwareDef: fixture96Plate as LabwareDefinition,
+ nestedLabwareDefsBottomToTop: fixture96Plate as LabwareDefinition,
},
],
darkFill: 'rebeccapurple',
diff --git a/components/src/hardware-sim/Pipette/PipetteRender.stories.tsx b/components/src/hardware-sim/Pipette/PipetteRender.stories.tsx
index ae4dceee752..df8a9c511b2 100644
--- a/components/src/hardware-sim/Pipette/PipetteRender.stories.tsx
+++ b/components/src/hardware-sim/Pipette/PipetteRender.stories.tsx
@@ -4,19 +4,40 @@ import { getAllDefinitions, getAllPipetteNames } from '@opentrons/shared-data'
import { RobotWorkSpace } from '../Deck'
import { LabwareRender } from '../Labware'
-import { PipetteRender } from './'
+import { PipetteRender as PipetteRenderComponent } from './'
-import type { Meta, Story } from '@storybook/react'
+import type { Meta, StoryObj } from '@storybook/react'
import type { LabwareDefinition, PipetteName } from '@opentrons/shared-data'
const DECK_MAP_VIEWBOX = '0 -140 230 230'
-const opentrons300UlTiprack = getAllDefinitions().opentrons96Tiprack300UlV1
-const opentrons10UlTiprack = getAllDefinitions().opentrons96Tiprack10UlV1
-const nest12Reservoir15ml = getAllDefinitions().nest12Reservoir15MlV1
-const axygenReservoir90ml = getAllDefinitions().axygen1Reservoir90MlV1
+const allDefinitions = getAllDefinitions()
+
+// Find labware definitions by loadName
+const findLabwareByLoadName = (
+ loadName: string
+): LabwareDefinition | undefined => {
+ const definitions = Object.values(allDefinitions) as LabwareDefinition[]
+ return definitions.find(def => def.parameters.loadName === loadName)
+}
+
+const allDefsArray = Object.values(allDefinitions) as LabwareDefinition[]
+const defaultDef = allDefsArray[0]
+
+if (defaultDef == null) {
+ throw new Error('No labware definitions found')
+}
+
+const opentrons300UlTiprack =
+ findLabwareByLoadName('opentrons_96_tiprack_300ul') ?? defaultDef
+const opentrons10UlTiprack =
+ findLabwareByLoadName('opentrons_96_tiprack_10ul') ?? defaultDef
+const nest12Reservoir15ml =
+ findLabwareByLoadName('nest_12_reservoir_15ml') ?? defaultDef
+const axygenReservoir90ml =
+ findLabwareByLoadName('axygen_1_reservoir_90ml') ?? defaultDef
const opentrons6TuberackNest50mlConical =
- getAllDefinitions().opentrons6TuberackNest50MlConicalV1
+ findLabwareByLoadName('opentrons_6_tuberack_nest_50ml_conical') ?? defaultDef
const labwareDefMap: Record = {
[opentrons300UlTiprack.metadata.displayName]: opentrons300UlTiprack,
@@ -27,47 +48,57 @@ const labwareDefMap: Record = {
opentrons6TuberackNest50mlConical,
}
const pipetteNames = Object.keys(getAllPipetteNames()) as PipetteName[]
+const labwareDisplayNames = Object.keys(labwareDefMap)
-export default {
- title: 'Library/Molecules/Simulation/Pipette/PipetteRender',
-} as Meta
-
-const Template: Story<{
+interface StoryArgs {
labwareName: string
pipetteName: PipetteName
-}> = args => {
- const labwareDef = labwareDefMap[args.labwareName]
- return (
-
- {() => (
-
-
- )}
-
- )
}
-export const Pipette = Template.bind({})
-Pipette.argTypes = {
- labwareName: {
- control: {
- type: 'select',
- options: Object.keys(labwareDefMap).map(
- d => labwareDefMap[d].metadata.displayName
- ),
+const meta: Meta = {
+ title: 'Library/Molecules/Simulation/Pipette/PipetteRender',
+ argTypes: {
+ labwareName: {
+ control: {
+ type: 'select',
+ },
+ options: labwareDisplayNames,
},
- defaultValue: opentrons300UlTiprack.metadata.displayName,
- },
- pipetteName: {
- control: {
- type: 'select',
+ pipetteName: {
+ control: {
+ type: 'select',
+ },
options: pipetteNames,
},
- defaultValue: pipetteNames[0],
+ },
+ decorators: [
+ Story => (
+
+ {() =>
+ ),
+ ],
+}
+
+export default meta
+
+type Story = StoryObj
+
+export const PipetteRender: Story = {
+ args: {
+ labwareName: opentrons300UlTiprack.metadata.displayName,
+ pipetteName: pipetteNames[0],
+ },
+ render: args => {
+ const labwareDef = labwareDefMap[args.labwareName] ?? opentrons300UlTiprack
+ return (
+
+
+ )
},
}
diff --git a/components/src/molecules/ParametersTable/ParametersTable.stories.tsx b/components/src/molecules/ParametersTable/ParametersTable.stories.tsx
index ad2ab5b1fe0..c057481cab8 100644
--- a/components/src/molecules/ParametersTable/ParametersTable.stories.tsx
+++ b/components/src/molecules/ParametersTable/ParametersTable.stories.tsx
@@ -1,7 +1,6 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import * as React from 'react-remove-scroll'
-import { Flex } from '../../primitives'
import { SPACING } from '../../ui-style-constants'
import { ParametersTable } from './index'
@@ -152,13 +151,13 @@ const runTimeParameters: RunTimeParameter[] = [
]
const meta: Meta = {
- title: 'Library/Molecules/ParametersTable',
+ title: 'Helix/Molecules/ParametersTable',
component: ParametersTable,
decorators: [
Story => (
-
+
export const DefaultParameterTable: Story = {
args: {
- runTimeParameters: runTimeParameters,
+ runTimeParameters,
},
}
diff --git a/components/src/molecules/TimelineScrubber/TimelineScrubber.stories.tsx b/components/src/molecules/TimelineScrubber/TimelineScrubber.stories.tsx
index 65ba279ea04..44af3d610ca 100644
--- a/components/src/molecules/TimelineScrubber/TimelineScrubber.stories.tsx
+++ b/components/src/molecules/TimelineScrubber/TimelineScrubber.stories.tsx
@@ -1,6 +1,8 @@
import { useState } from 'react'
import { action } from '@storybook/addon-actions'
+import { DIRECTION_COLUMN, SPACING } from '@opentrons/components'
+
import { TimelineScrubber as TimelineScrubberComponent } from './index'
import type { Meta, StoryObj } from '@storybook/react'
@@ -35,7 +37,13 @@ function TimelineScrubber(args: any): JSX.Element {
}
return (
-
mock FixtureTable
)
- vi.mocked(useRunStatus).mockReturnValue(RUN_STATUS_IDLE)
+ vi.mocked(useNotifyRunQuery).mockReturnValue({
+ data: { data: { status: RUN_STATUS_IDLE } },
+ } as any)
})
afterEach(() => {
diff --git a/app/src/organisms/ODD/QuickTransferFlow/Dispense/hooks/useDispenseSettingsConfig.ts b/app/src/organisms/ODD/QuickTransferFlow/Dispense/hooks/useDispenseSettingsConfig.ts
index 95e7328316b..2af5135fa4c 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/Dispense/hooks/useDispenseSettingsConfig.ts
+++ b/app/src/organisms/ODD/QuickTransferFlow/Dispense/hooks/useDispenseSettingsConfig.ts
@@ -55,6 +55,35 @@ export function useDispenseSettingsConfig({
return t('blow_out_into_waste_chute')
}
}
+ const getDisposalVolumeLocationCopy = (): string => {
+ if (state.disposalVolumeDispenseSettings?.blowOutLocation == null) {
+ return t('trashBin')
+ }
+ if (
+ state.disposalVolumeDispenseSettings.blowOutLocation ===
+ SOURCE_WELL_BLOWOUT_DESTINATION
+ ) {
+ return t('blow_out_source_well')
+ }
+ if (
+ typeof state.disposalVolumeDispenseSettings.blowOutLocation ===
+ 'object' &&
+ state.disposalVolumeDispenseSettings.blowOutLocation.cutoutFixtureId ===
+ TRASH_BIN_ADAPTER_FIXTURE
+ ) {
+ return t('trashBin')
+ }
+ if (
+ typeof state.disposalVolumeDispenseSettings.blowOutLocation ===
+ 'object' &&
+ WASTE_CHUTE_FIXTURES.includes(
+ state.disposalVolumeDispenseSettings.blowOutLocation.cutoutFixtureId
+ )
+ ) {
+ return t('wasteChute')
+ }
+ return t('trashBin')
+ }
const touchTipEnabled = getIsTouchTipEnabled(state.destination)
const hasLiquidClass = state.liquidClassName !== 'none'
@@ -197,11 +226,7 @@ export function useDispenseSettingsConfig({
state.disposalVolumeDispenseSettings != null && isMultiTransfer
? t('disposal_volume_label', {
volume: state.disposalVolumeDispenseSettings.volume,
- location:
- state.disposalVolumeDispenseSettings.blowOutLocation ===
- SOURCE_WELL_BLOWOUT_DESTINATION
- ? t('blow_out_source_well')
- : t('trashBin'),
+ location: getDisposalVolumeLocationCopy(),
flowRate: state.disposalVolumeDispenseSettings.flowRate,
})
: t('option_disabled'),
diff --git a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/AirGap.tsx b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/AirGap.tsx
index 259398de628..99bdec034dc 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/AirGap.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/AirGap.tsx
@@ -119,7 +119,7 @@ export function AirGap(props: AirGapProps): JSX.Element {
? getAspirateAirGapVolumeRange(state.pipette, state.tipRack)
: getDispenseAirGapVolumeRange(
state.volume,
- state?.disposalVolume ?? 0,
+ state?.disposalVolumeDispenseSettings?.volume ?? 0,
state.path,
state.pipette,
state.tipRack
diff --git a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/DisposalVolume.tsx b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/DisposalVolume.tsx
index 23e77b98a7f..3de5602e297 100644
--- a/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/DisposalVolume.tsx
+++ b/app/src/organisms/ODD/QuickTransferFlow/QuickTransferAdvancedSettings/DisposalVolume.tsx
@@ -14,6 +14,7 @@ import {
StyledText,
} from '@opentrons/components'
import {
+ FLEX_SINGLE_SLOT_BY_CUTOUT_ID,
getTipTypeFromTipRackDefinition,
LOW_VOLUME_PIPETTES,
TRASH_BIN_ADAPTER_FIXTURE,
@@ -65,41 +66,62 @@ export function DisposalVolume(props: DisposalVolumeProps): JSX.Element {
if (typeof blowOut.location === 'string') {
return blowOut.location
}
- return `trashBin:${blowOut.location.cutoutId}`
+ if (
+ 'cutoutFixtureId' in blowOut.location &&
+ typeof blowOut.location.cutoutFixtureId === 'string' &&
+ WASTE_CHUTE_FIXTURES.includes(blowOut.location.cutoutFixtureId)
+ ) {
+ return `wasteChute:${blowOut.location.cutoutId}`
+ }
+ if ('cutoutId' in blowOut.location) {
+ return `trashBin:${blowOut.location.cutoutId}`
+ }
+ return ''
}
const [selectedBlowoutLocation, setSelectedBlowoutLocation] =
useState
-
- )
- break
- }
- default:
- moduleDetails =
-
- Block temp status
-
-
-
-
- Lid temp status
-
-
-
-
- Lid status
-
-
- {moduleState.lidOpen || moduleState.lidOpen == null
- ? 'Open'
- : 'Closed'}
-
-
- TODO: wire up module details
- }
-
- return (
- <>
-
-
-
-
- {moduleName}
-
-
- {moduleDetails}
-
-
- )
-}
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/SlotDetailsEmptyState.tsx b/app/src/pages/Desktop/Protocols/ProtocolVisualization/SlotDetailsEmptyState.tsx
deleted file mode 100644
index 38479c02c98..00000000000
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/SlotDetailsEmptyState.tsx
+++ /dev/null
@@ -1,18 +0,0 @@
-import { COLORS, StyledText } from '@opentrons/components'
-
-import styles from './visualization.module.css'
-
-export function SlotDetailsEmptyState(): JSX.Element {
- return (
-
-
-
-
-
- Slot
-
-
-
- )
-}
diff --git a/app/src/pages/Desktop/Protocols/ProtocolVisualization/TrashSlotDetails.tsx b/app/src/pages/Desktop/Protocols/ProtocolVisualization/TrashSlotDetails.tsx
deleted file mode 100644
index 9f56d0e0e3f..00000000000
--- a/app/src/pages/Desktop/Protocols/ProtocolVisualization/TrashSlotDetails.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Divider, StyledText } from '@opentrons/components'
-
-import styles from './visualization.module.css'
-
-import type { TrashBinEntities } from '@opentrons/step-generation'
-
-interface TrashSlotDetailsProps {
- trashBinEntities: TrashBinEntities
-}
-
-export function TrashSlotDetails(props: TrashSlotDetailsProps): JSX.Element {
- const { trashBinEntities } = props
-
- const header =
- Object.values(trashBinEntities).length > 0 ? 'Trash bin' : 'Waste Chute'
-
- return (
- <>
-
-
- Empty
-
-
-
-
-
-
-
-
- {header}
-
-
+
= {
+ title: 'Helix/Organisms/LabwareDetailsWithCount',
+ component: LabwareDetailsWithCount,
+ decorators: [
+ Story => (
+
+
+export const LabwareDetailsWithCountStory: Story = {
+ args: {
+ title: 'Opentrons Flex 96 Tip Rack 1000 µL',
+ subTitle: 'With tip rack lid',
+ quantity: 1,
+ },
+}
diff --git a/components/src/organisms/LabwareDetailsWithCount/__tests__/LabwareDetailsWithCount.test.tsx b/components/src/organisms/LabwareDetailsWithCount/__tests__/LabwareDetailsWithCount.test.tsx
new file mode 100644
index 00000000000..73b074ada79
--- /dev/null
+++ b/components/src/organisms/LabwareDetailsWithCount/__tests__/LabwareDetailsWithCount.test.tsx
@@ -0,0 +1,59 @@
+import { useTranslation } from 'react-i18next'
+import { screen } from '@testing-library/react'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
+
+import { LabwareDetailsWithCount } from '..'
+import { renderWithProviders } from '../../../testing/utils'
+
+import type { ComponentProps } from 'react'
+
+vi.mock('react-i18next', () => ({
+ useTranslation: vi.fn(),
+ initReactI18next: vi.fn(),
+}))
+
+vi.mock('i18next', () => {
+ return {
+ default: {
+ use: () => ({ init: vi.fn() }),
+ createInstance: () => ({
+ use: () => ({ init: vi.fn() }),
+ init: vi.fn(),
+ t: (k: string) => k,
+ }),
+ init: vi.fn(),
+ t: (k: string) => k,
+ },
+ }
+})
+const render = (props: ComponentProps) => {
+ return renderWithProviders(
+ const t = vi.fn(key => key)
+ beforeEach(() => {
+ props = {
+ title: 'Title',
+ subTitle: 'SubTitle',
+ quantity: 1,
+ }
+ vi.mocked(useTranslation).mockReturnValue({ t } as any)
+ })
+
+ it('should render title, subTitle and label', () => {
+ render(props)
+ expect(screen.getByText('Title')).toBeInTheDocument()
+ expect(screen.getByText('SubTitle')).toBeInTheDocument()
+ expect(screen.getByText('quantity')).toBeInTheDocument()
+ })
+
+ it('should render title without subTitle and label', () => {
+ props.subTitle = undefined
+ props.quantity = undefined
+ render(props)
+ expect(screen.getByText('Title')).toBeInTheDocument()
+ expect(screen.queryByText('SubTitle')).not.toBeInTheDocument()
+ expect(screen.queryByText('quantity')).not.toBeInTheDocument()
+ })
+})
diff --git a/components/src/organisms/LabwareDetailsWithCount/index.tsx b/components/src/organisms/LabwareDetailsWithCount/index.tsx
new file mode 100644
index 00000000000..8f53ad1ccb2
--- /dev/null
+++ b/components/src/organisms/LabwareDetailsWithCount/index.tsx
@@ -0,0 +1,31 @@
+import { useTranslation } from 'react-i18next'
+
+import { StyledText, Tag } from '../../atoms'
+import styles from './LabwareDetailsWithCount.module.css'
+
+interface LabwareDetailsWithCountProps {
+ title: string
+ subTitle?: string
+ quantity?: number
+}
+
+export function LabwareDetailsWithCount({
+ title,
+ subTitle,
+ quantity: label,
+}: LabwareDetailsWithCountProps): JSX.Element {
+ const { t } = useTranslation('protocol_command_text')
+ return (
+ = {
+ title: 'Helix/Molecules/Splash',
+ component: SplashComponent,
decorators: [
Story => (
-
+
-const Template: Story> = args => (
-
Timeline Scrubber
Drag the sliders to update the values
+
+ ),
+ ],
+}
+export default meta
+
+type Story = StoryObj
+ {title}
+
+ )
+}
diff --git a/components/src/organisms/index.ts b/components/src/organisms/index.ts
index c06b079cf62..2d033a3c7ad 100644
--- a/components/src/organisms/index.ts
+++ b/components/src/organisms/index.ts
@@ -1,6 +1,7 @@
export * from './CommandText'
export * from './DeckLabelSet'
export * from './FixtureOption'
+export * from './LabwareDetailsWithCount'
export * from './LabwareInfoOverlay'
export * from './ProtocolDeck'
export * from './Toolbox'
diff --git a/components/src/structure/Splash.stories.tsx b/components/src/structure/Splash.stories.tsx
index 2aced8269ba..c0f95718025 100644
--- a/components/src/structure/Splash.stories.tsx
+++ b/components/src/structure/Splash.stories.tsx
@@ -1,25 +1,24 @@
-import { Box } from '@opentrons/components'
-
import { Splash as SplashComponent } from './Splash'
-import type { Meta, Story } from '@storybook/react'
-import type * as React from 'react'
+import type { Meta, StoryObj } from '@storybook/react'
-export default {
- title: 'Library/Molecules/Splash',
+const meta: Meta
+ {subTitle}
+
+ {label != null ? (
+
+
+ ) : null}
+
@@ -48,19 +51,14 @@ You can also purchase a [set of four slots](https://opentrons.com/products/opent
## Deck fixtures
-Fixtures are hardware items that replace standard deck slots. They let
-you customize the deck layout and add functionality to your Flex.
-Currently, deck fixtures include the staging area slots, the internal
-trash bin, and the external waste chute. You can only install fixtures
-in a few specific deck slots. The following table lists the deck
-locations for each fixture.
+Fixtures are hardware items that replace standard deck slots. They let you customize the deck layout and add functionality to your Flex. Currently, deck fixtures include the staging area slots, the internal trash bin, and the external waste chute. You can only install fixtures in a few specific deck slots. The following table lists the deck locations for each fixture.
| **Fixture** | **Slots** |
|------------------------------------|-------------------|
-| Staging area slots | A3–D3 |
+| Staging area slots | A4–D4 |
| Trash bin | A1–D1 and A3–D3 |
| Waste chute | D3 only |
-| Waste chute with staging area slot | D3 only |
+| Waste chute with staging area slot | D3 and D4 |
Fixtures are unpowered. They do not contain electronic or mechanical components that communicate their current state and deck location to the robot. This means you have to use the deck configuration feature to let the Flex know what fixtures are attached to the deck and where they're located.
@@ -77,7 +75,7 @@ The Opentrons Flex Waste Chute transfers liquids, tips, tip racks, and well plat
## Staging area slots
-Staging area slots are ANSI/SLAS compatible deck pieces that replace standard slots in column 3 and add new slots to the staging area — all without losing space in the working area. You can install a single slot or a maximum of four slots to create a new column (A4 to D4) along the right side of the deck. Note, however, that replacing deck slot A3 requires moving the trash bin. By adding staging area slots to the deck, your Flex robot can store more labware and operate more efficiently.
+_Staging area slots_ are ANSI/SLAS compatible deck pieces that replace standard slots in column 3 to create new slots in the [staging area](#staging-area) (column 4). You can install a single slot or a maximum of four slots to create new location coordinates (A4 to D4) along the right side of the deck. Note, however, that replacing deck slot A3 requires moving the trash bin. By adding staging area slots to the deck, your Flex robot can store more labware and operate more efficiently.
@@ -119,7 +117,7 @@ The electronics contained in the gantry provide 36 VDC power and communications
Location of instrument mounts on Flex.
-## Touchscreen and LED displays
+## Touchscreen display
The primary user interface is the 7-inch LCD *touchscreen*, located on the front right of the robot. The touchscreen is covered with Gorilla Glass 3 for scratch and damage resistance. Access many features of Flex right on the touchscreen, including:
@@ -137,6 +135,8 @@ The primary user interface is the 7-inch LCD *touchscreen*, located on the front
For more information on using Flex via the touchscreen, see the [Touchscreen chapter](../touchscreen/index.md).
+## Status light { #status-light-flex }
+
The *status light* is a strip of LEDs along the top front of the robot that provides at-a-glance information about the robot. Different colors and patterns of illumination can communicate various success, failure, or idle states:
@@ -176,10 +176,14 @@ The *status light* is a strip of LEDs along the top front of the robot that prov
| Protocol is paused | |||
| Yellow Abnormal states |
+ Yellow Abnormal states |
Solid | Software error |
| Pulsing | +Error recovery mode | +||
| Red Emergency states |
Blinks three times, repeatedly | diff --git a/docs/flex/docs/touchscreen/deck-config.md b/docs/flex/docs/touchscreen/deck-config.md index da9368a56cc..b12f5e5687a 100644 --- a/docs/flex/docs/touchscreen/deck-config.md +++ b/docs/flex/docs/touchscreen/deck-config.md @@ -29,8 +29,8 @@ To add deck fixtures via the touchscreen: Click the :octicons-x-circle-fill-16: on a fixture on the deck map to remove it from the deck configuration.