fix(app): return calibration flow even if pipette is already calibrat…

…ed (#14506) fix RQA-2357
Opentrons · Feb 15, 2024 · 9224b13 · 9224b13
1 parent 9dc8f2d
commit 9224b13
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 38 deletions.
diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx
@@ -24,29 +24,13 @@ const mockSingleMountPipetteAttached = {
 }
 
 describe('getPipetteWizardStepsForProtocol', () => {
- it('returns an empty array of info when the attached pipette matches required pipette', () => {
- const mockFlowSteps = [] as PipetteWizardStep[]
- expect(
- getPipetteWizardStepsForProtocol(
- mockSingleMountPipetteAttached,
- [
- {
- id: '123',
- pipetteName: 'p1000_single_flex',
- mount: 'left',
- },
- ],
- LEFT
- )
- ).toStrictEqual(mockFlowSteps)
- })
  it('returns an empty array when there is no pipette attached and no pipette is needed', () => {
- const mockFlowSteps = [] as PipetteWizardStep[]
+ const mockFlowSteps = null as PipetteWizardStep[] | null
  expect(
  getPipetteWizardStepsForProtocol({ left: null, right: null }, [], LEFT)
  ).toStrictEqual(mockFlowSteps)
  })
- it('returns the calibration flow only when correct pipette is attached but there is no pip cal data', () => {
+ it('returns the calibration flow only when correct pipette is attached even if there is pip cal data', () => {
  const mockFlowSteps = [
  {
  section: SECTIONS.BEFORE_BEGINNING,
@@ -71,7 +55,6 @@ describe('getPipetteWizardStepsForProtocol', () => {
  left: null,
  right: {
  ...mockAttachedPipetteInformation,
- data: { calibratedOffset: undefined as any },
  } as any,
  },
  [{ id: '123', pipetteName: 'p1000_single_flex', mount: 'right' }],

diff --git a/app/src/organisms/PipetteWizardFlows/getPipetteWizardSteps.ts b/app/src/organisms/PipetteWizardFlows/getPipetteWizardSteps.ts
@@ -12,7 +12,7 @@ export const getPipetteWizardSteps = (
  mount: PipetteMount,
  selectedPipette: SelectablePipettes,
  isGantryEmpty: boolean
-): PipetteWizardStep[] => {
+): PipetteWizardStep[] | null => {
  switch (flowType) {
  case FLOWS.CALIBRATE: {
  return [
@@ -205,5 +205,5 @@ export const getPipetteWizardSteps = (
  }
  }
  }
- return []
+ return null
 }
diff --git a/app/src/organisms/PipetteWizardFlows/getPipetteWizardStepsForProtocol.ts b/app/src/organisms/PipetteWizardFlows/getPipetteWizardStepsForProtocol.ts
@@ -8,23 +8,17 @@ export const getPipetteWizardStepsForProtocol = (
  attachedPipettes: AttachedPipettesFromInstrumentsQuery,
  pipetteInfo: LoadedPipette[],
  mount: Mount
-): PipetteWizardStep[] => {
+): PipetteWizardStep[] | null => {
  const requiredPipette = pipetteInfo.find(pipette => pipette.mount === mount)
  const nintySixChannelAttached =
  attachedPipettes[LEFT]?.instrumentName === 'p1000_96'
 
- // return empty array when correct pipette is attached && pipette cal not needed or
- // no pipette is required in the protocol
- if (
- (requiredPipette?.pipetteName === attachedPipettes[mount]?.instrumentName &&
- attachedPipettes[mount]?.data?.calibratedOffset?.last_modified != null) ||
- requiredPipette == null
- ) {
- return []
- // return calibration flow only if correct pipette is attached and pipette cal null
+ // return empty array if no pipette is required in the protocol
+ if (requiredPipette == null) {
+ return null
+ // return calibration flow if correct pipette is attached
  } else if (
- requiredPipette?.pipetteName === attachedPipettes[mount]?.instrumentName &&
- attachedPipettes[mount]?.data?.calibratedOffset?.last_modified == null
+ requiredPipette?.pipetteName === attachedPipettes[mount]?.instrumentName
  ) {
  return [
  {

diff --git a/app/src/organisms/PipetteWizardFlows/index.tsx b/app/src/organisms/PipetteWizardFlows/index.tsx
@@ -86,8 +86,8 @@ export const PipetteWizardFlows = (
  )
  const host = useHost()
  const [currentStepIndex, setCurrentStepIndex] = React.useState<number>(0)
- const totalStepCount = pipetteWizardSteps.length - 1
- const currentStep = pipetteWizardSteps?.[currentStepIndex]
+ const totalStepCount = pipetteWizardSteps ? pipetteWizardSteps.length - 1 : 0
+ const currentStep = pipetteWizardSteps?.[currentStepIndex] ?? null
  const [isFetchingPipettes, setIsFetchingPipettes] = React.useState<boolean>(
  false
  )
@@ -253,10 +253,10 @@ export const PipetteWizardFlows = (
  isOnDevice,
  }
  const is96ChannelUnskippableStep =
- currentStep.section === SECTIONS.CARRIAGE ||
- currentStep.section === SECTIONS.MOUNTING_PLATE ||
+ currentStep?.section === SECTIONS.CARRIAGE ||
+ currentStep?.section === SECTIONS.MOUNTING_PLATE ||
  (selectedPipette === NINETY_SIX_CHANNEL &&
- currentStep.section === SECTIONS.DETACH_PIPETTE)
+ currentStep?.section === SECTIONS.DETACH_PIPETTE)
 
  const exitModal = is96ChannelUnskippableStep ? (
  <UnskippableModal