Updating naming from gen3 to flex in app and components

Opentrons · Jul 13, 2023 · 3ed3374 · 3ed3374
1 parent 16db70d
commit 3ed3374
Show file tree

Hide file tree

Showing 27 changed files with 72 additions and 74 deletions.
diff --git a/app/src/molecules/PipetteSelect/PipetteSelect.stories.tsx b/app/src/molecules/PipetteSelect/PipetteSelect.stories.tsx
@@ -29,9 +29,9 @@ PipetteSelect.args = {
   nameBlocklist: [
     'p20_multi_gen2',
     'p300_multi_gen2',
-    'p20_single_gen3',
-    'p300_single_gen3',
-    'p1000_single_gen3',
+    'p20_single_flex',
+    'p300_single_flex',
+    'p1000_single_flex',
   ],
   enableNoneOption: true,
 }
diff --git a/app/src/molecules/WizardRequiredEquipmentList/equipmentImages.ts b/app/src/molecules/WizardRequiredEquipmentList/equipmentImages.ts
@@ -5,7 +5,7 @@ export const equipmentImages = {
   calibration_probe: require('../../assets/images/change-pip/calibration_probe.png'),
   t10_torx_screwdriver: require('../../assets/images/t10_torx_screwdriver.png'),
   hex_screwdriver: require('../../assets/images/change-pip/hex_screwdriver.png'),
-  gen3_pipette: require('../../assets/images/change-pip/single_mount_pipettes.png'),
+  flex_pipette: require('../../assets/images/change-pip/single_mount_pipettes.png'),
   pipette_96: require('../../assets/images/change-pip/ninety-six-channel.png'),
   mounting_plate_96_channel: require('../../assets/images/change-pip/mounting-plate-96-channel.png'),
   flex_gripper: require('../../assets/images/flex_gripper.svg'),

diff --git a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteCard.test.tsx b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteCard.test.tsx
@@ -169,7 +169,7 @@ describe('PipetteCard', () => {
   it('renders banner to calibrate for ot3 pipette if not calibrated', () => {
     when(mockUseIsOT3).calledWith(mockRobotName).mockReturnValue(true)
     const { getByText } = render({
-      pipetteInfo: { ...mockLeftSpecs, name: 'p300_single_gen3' },
+      pipetteInfo: { ...mockLeftSpecs, name: 'p300_single_flex' },
       mount: LEFT,
       robotName: mockRobotName,
       is96ChannelAttached: false,

diff --git a/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx b/app/src/organisms/Devices/PipetteCard/__tests__/PipetteOverflowMenu.test.tsx
@@ -110,7 +110,7 @@ describe('PipetteOverflowMenu', () => {
     ).toBeInTheDocument()
   })
 
-  it('renders only the about pipette button if OT-3/GEN3 pipette is attached', () => {
+  it('renders only the about pipette button if FLEX pipette is attached', () => {
     mockIsOT3Pipette.mockReturnValue(true)
 
     const { getByRole, queryByRole } = render(props)

diff --git a/app/src/organisms/InstrumentMountItem/__tests__/ProtocolInstrumentMountItem.test.tsx b/app/src/organisms/InstrumentMountItem/__tests__/ProtocolInstrumentMountItem.test.tsx
@@ -36,7 +36,7 @@ const mockGripperData = {
   ok: true,
 }
 const mockLeftPipetteData = {
-  instrumentModel: 'p1000_multi_gen3',
+  instrumentModel: 'p1000_multi_flex',
   instrumentType: 'p1000',
   mount: 'left',
   serialNumber: 'def456',
@@ -71,7 +71,7 @@ describe('ProtocolInstrumentMountItem', () => {
       mount: LEFT,
       attachedInstrument: null,
       attachedCalibrationData: null,
-      speccedName: 'p1000_multi_gen3',
+      speccedName: 'p1000_multi_flex',
     }
     mockPipetteWizardFlows.mockReturnValue(<div>pipette wizard flow</div>)
     mockUseMaintenanceRunTakeover.mockReturnValue({

diff --git a/app/src/organisms/OnDeviceDisplay/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx b/app/src/organisms/OnDeviceDisplay/RobotDashboard/__tests__/RecentRunProtocolCard.test.tsx
@@ -33,7 +33,7 @@ const RUN_ID = 'mockRunId'
 const mockMissingPipette = [
   {
     hardwareType: 'pipette',
-    pipetteName: 'p1000_single_gen3',
+    pipetteName: 'p1000_single_flex',
     mount: 'left',
     connected: false,
   },
@@ -51,7 +51,7 @@ const mockMissingModule = [
 const missingBoth = [
   {
     hardwareType: 'pipette',
-    pipetteName: 'p1000_single_gen3',
+    pipetteName: 'p1000_single_flex',
     mount: 'left',
     connected: false,
   },

diff --git a/.../organisms/OnDeviceDisplay/RobotDashboard/hooks/__tests__/useMissingHardwareText.test.tsx b/.../organisms/OnDeviceDisplay/RobotDashboard/hooks/__tests__/useMissingHardwareText.test.tsx
@@ -80,13 +80,13 @@ describe('useMissingHardwareText', () => {
         useMissingHardwareText([
           {
             hardwareType: 'pipette',
-            pipetteName: 'p50_multi_gen3',
+            pipetteName: 'p50_multi_flex',
             mount: 'left',
             connected: false,
           },
           {
             hardwareType: 'pipette',
-            pipetteName: 'p1000_multi_gen3',
+            pipetteName: 'p1000_multi_flex',
             mount: 'right',
             connected: false,
           },
@@ -103,7 +103,7 @@ describe('useMissingHardwareText', () => {
         useMissingHardwareText([
           {
             hardwareType: 'pipette',
-            pipetteName: 'p50_multi_gen3',
+            pipetteName: 'p50_multi_flex',
             mount: 'left',
             connected: false,
           },

diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/BeforeBeginning.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/BeforeBeginning.test.tsx
@@ -89,7 +89,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -179,7 +179,7 @@ describe('BeforeBeginning', () => {
         requiredPipette: {
           mount: LEFT,
           id: 'abc',
-          pipetteName: 'p1000_single_gen3',
+          pipetteName: 'p1000_single_flex',
         },
       }
       const { getByText, getByAltText, getByRole } = render(props)
@@ -206,7 +206,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -247,7 +247,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -346,7 +346,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: RIGHT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -398,7 +398,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -455,7 +455,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },
@@ -515,7 +515,7 @@ describe('BeforeBeginning', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },

diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/PipetteWizardFlows.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/PipetteWizardFlows.test.tsx
@@ -161,7 +161,7 @@ describe('PipetteWizardFlows', () => {
             params: {
               mount: LEFT,
               pipetteId: 'abc',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
             },
           },
           { commandType: 'home' as const, params: {} },

diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/Results.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/Results.test.tsx
@@ -92,7 +92,7 @@ describe('Results', () => {
         {
           commandType: 'loadPipette' as const,
           params: {
-            pipetteName: 'p1000_single_gen3',
+            pipetteName: 'p1000_single_flex',
             pipetteId: 'abc',
             mount: 'left',
           },
@@ -124,7 +124,7 @@ describe('Results', () => {
         {
           commandType: 'loadPipette' as const,
           params: {
-            pipetteName: 'p1000_single_gen3',
+            pipetteName: 'p1000_single_flex',
             pipetteId: 'abc',
             mount: 'left',
           },
@@ -320,7 +320,7 @@ describe('Results', () => {
       flowType: FLOWS.ATTACH,
       requiredPipette: {
         id: 'mockId',
-        pipetteName: 'p1000_single_gen3',
+        pipetteName: 'p1000_single_flex',
         mount: LEFT,
       },
     }
@@ -333,7 +333,7 @@ describe('Results', () => {
       flowType: FLOWS.ATTACH,
       requiredPipette: {
         id: 'mockId',
-        pipetteName: 'p50_multi_gen3',
+        pipetteName: 'p50_multi_flex',
         mount: LEFT,
       },
     }

diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/getPipetteWizardStepsForProtocol.test.tsx
@@ -13,10 +13,10 @@ const mockPipetteInfo = [
 ] as LoadedPipette[]
 
 const mockPipettesInProtocolNotEmpty = [
-  { id: '123', pipetteName: 'p1000_single_gen3', mount: 'left' },
+  { id: '123', pipetteName: 'p1000_single_flex', mount: 'left' },
 ]
 const mockPipettesInProtocolMulti = [
-  { id: '123', pipetteName: 'p1000_multi_gen3', mount: 'left' },
+  { id: '123', pipetteName: 'p1000_multi_flex', mount: 'left' },
 ]
 const mockSingleMountPipetteAttached = {
   left: mockAttachedPipetteInformation,
@@ -32,7 +32,7 @@ describe('getPipetteWizardStepsForProtocol', () => {
         [
           {
             id: '123',
-            pipetteName: 'p1000_single_gen3',
+            pipetteName: 'p1000_single_flex',
             mount: 'left',
           },
         ],
@@ -74,7 +74,7 @@ describe('getPipetteWizardStepsForProtocol', () => {
             data: { calibratedOffset: undefined as any },
           } as any,
         },
-        [{ id: '123', pipetteName: 'p1000_single_gen3', mount: 'right' }],
+        [{ id: '123', pipetteName: 'p1000_single_flex', mount: 'right' }],
         RIGHT
       )
     ).toStrictEqual(mockFlowSteps)

diff --git a/app/src/organisms/PipetteWizardFlows/__tests__/hooks.test.tsx b/app/src/organisms/PipetteWizardFlows/__tests__/hooks.test.tsx
@@ -257,7 +257,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
               mount: LEFT,
             },
           ],
@@ -282,7 +282,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p1000_single_gen3',
+              pipetteName: 'p1000_single_flex',
               mount: LEFT,
             },
           ],
@@ -415,7 +415,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p50_single_gen3',
+              pipetteName: 'p50_single_flex',
               mount: LEFT,
             },
           ],
@@ -440,7 +440,7 @@ describe('usePipetteFlowWizardHeaderText', () => {
           pipetteInfo: [
             {
               id: 'id',
-              pipetteName: 'p50_single_gen3',
+              pipetteName: 'p50_single_flex',
               mount: LEFT,
             },
           ],

diff --git a/app/src/organisms/PipetteWizardFlows/constants.ts b/app/src/organisms/PipetteWizardFlows/constants.ts
@@ -38,7 +38,7 @@ export const HEX_SCREWDRIVER = {
     'Provided with the robot. Using another size can strip the instruments’s screws.',
 }
 export const PIPETTE = {
-  loadName: 'gen3_pipette',
+  loadName: 'flex_pipette',
   displayName: PIPETTE_DISPLAY_NAME,
 }
 export const NINETY_SIX_CHANNEL_PIPETTE = {

diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/OverflowMenu.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/OverflowMenu.tsx
@@ -82,7 +82,7 @@ export function OverflowMenu({
     showPipetteWizardFlows,
     setShowPipetteWizardFlows,
   ] = React.useState<boolean>(false)
-  const isGen3Pipette = isOT3Pipette(pipetteName as PipetteName)
+  const isFlexPipette = isOT3Pipette(pipetteName as PipetteName)
   const ot3PipCal =
     useAttachedPipettesFromInstrumentsQuery()[mount]?.data?.calibratedOffset
       ?.offset ?? null
@@ -102,7 +102,7 @@ export function OverflowMenu({
     e.preventDefault()
     if (
       !isRunning &&
-      isGen3Pipette &&
+      isFlexPipette &&
       calType === 'pipetteOffset' &&
       pipetteName != null
     ) {
@@ -199,7 +199,7 @@ export function OverflowMenu({
           right={0}
           flexDirection={DIRECTION_COLUMN}
         >
-          {isGen3Pipette ? (
+          {isFlexPipette ? (
             <MenuItem onClick={handleRecalibrate}>
               {t(
                 ot3PipCal == null

diff --git a/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/__test__/OverflowMenu.test.tsx b/app/src/organisms/RobotSettingsCalibration/CalibrationDetails/__test__/OverflowMenu.test.tsx
@@ -184,7 +184,7 @@ describe('OverflowMenu', () => {
     expect(saveAs).toHaveBeenCalled()
   })
 
-  it('recalibration button should open up the pipette wizard flow for gen3 pipettes', () => {
+  it('recalibration button should open up the pipette wizard flow for flex pipettes', () => {
     mockUseAttachedPipettesFromInstrumentsQuery.mockReturnValue({
       left: mockAttachedPipetteInformation,
       right: null,
@@ -207,7 +207,7 @@ describe('OverflowMenu', () => {
     getByText('mock pipette wizard flows')
   })
 
-  it('calibration button should open up the pipette wizard flow for gen3 pipettes', () => {
+  it('calibration button should open up the pipette wizard flow for flex pipettes', () => {
     mockPipetteWizardFlow.mockReturnValue(<div>mock pipette wizard flows</div>)
     mockUseAllPipetteOffsetCalibrationsQuery.mockReturnValue({
       data: {

diff --git a/app/src/pages/Protocols/hooks/__tests__/hooks.test.tsx b/app/src/pages/Protocols/hooks/__tests__/hooks.test.tsx
@@ -41,7 +41,7 @@ const PROTOCOL_ANALYSIS = {
   id: 'fake analysis',
   status: 'completed',
   labware: [],
-  pipettes: [{ id: 'pipId', pipetteName: 'p1000_multi_gen3', mount: 'left' }],
+  pipettes: [{ id: 'pipId', pipetteName: 'p1000_multi_flex', mount: 'left' }],
   modules: [
     {
       id: 'modId',
@@ -152,7 +152,7 @@ describe('useMissingProtocolHardware', () => {
     expect(result.current).toEqual([
       {
         hardwareType: 'pipette',
-        pipetteName: 'p1000_multi_gen3',
+        pipetteName: 'p1000_multi_flex',
         mount: 'left',
         connected: false,
       },
@@ -167,7 +167,7 @@ describe('useMissingProtocolHardware', () => {
   it('should return empty array when the correct modules and pipettes are attached', () => {
     mockUseAttachedPipettes.mockReturnValue({
       left: {
-        name: 'p1000_multi_gen3',
+        name: 'p1000_multi_flex',
       },
       right: {},
     } as any)