fix(app): add prop so run setup pipette flows are strung together (#…

…14460) fix RQA-2305
Opentrons · Feb 9, 2024 · ce940e8 · ce940e8
1 parent a3428ad
commit ce940e8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/app/src/organisms/InstrumentMountItem/ProtocolInstrumentMountItem.tsx b/app/src/organisms/InstrumentMountItem/ProtocolInstrumentMountItem.tsx
@@ -19,6 +19,7 @@ import {
  NINETY_SIX_CHANNEL,
  PipetteName,
  SINGLE_MOUNT_PIPETTES,
+ LoadedPipette,
 } from '@opentrons/shared-data'
 
 import { SmallButton } from '../../atoms/buttons'
@@ -49,6 +50,7 @@ interface ProtocolInstrumentMountItemProps {
  attachedInstrument: InstrumentData | null
  speccedName: PipetteName | GripperModel
  instrumentsRefetch?: () => void
+ pipetteInfo?: LoadedPipette[]
 }
 export function ProtocolInstrumentMountItem(
  props: ProtocolInstrumentMountItemProps
@@ -172,6 +174,7 @@ export function ProtocolInstrumentMountItem(
  closeFlow={() => setShowPipetteWizardFlow(false)}
  selectedPipette={selectedPipette}
  mount={mount as Mount}
+ pipetteInfo={props.pipetteInfo}
  onComplete={props.instrumentsRefetch}
  />
  ) : null}

diff --git a/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx b/app/src/organisms/PipetteWizardFlows/MountingPlate.tsx
@@ -5,6 +5,7 @@ import { COLORS, SPACING } from '@opentrons/components'
 import { StyledText } from '../../atoms/text'
 import { SimpleWizardBody } from '../../molecules/SimpleWizardBody'
 import { GenericWizardTile } from '../../molecules/GenericWizardTile'
+import { InProgressModal } from '../../molecules/InProgressModal/InProgressModal'
 import { getPipetteAnimations96 } from './utils'
 import { BODY_STYLE, FLOWS, SECTIONS } from './constants'
 import type { PipetteWizardStepProps } from './types'
@@ -13,6 +14,7 @@ export const MountingPlate = (
  props: PipetteWizardStepProps
 ): JSX.Element | null => {
  const {
+ isRobotMoving,
  goBack,
  proceed,
  flowType,
@@ -46,6 +48,7 @@ export const MountingPlate = (
  })
  }
 
+ if (isRobotMoving) return <InProgressModal description={t('stand_back')} />
  return errorMessage ? (
  <SimpleWizardBody
  iconColor={COLORS.red50}

diff --git a/app/src/organisms/ProtocolSetupInstruments/index.tsx b/app/src/organisms/ProtocolSetupInstruments/index.tsx
@@ -86,6 +86,7 @@ export function ProtocolSetupInstruments({
  speccedName={loadedPipette.pipetteName}
  attachedInstrument={attachedPipetteMatch}
  instrumentsRefetch={refetch}
+ pipetteInfo={mostRecentAnalysis?.pipettes}
  />
  )
  })}