refactor(step-generation, protocol-designer): atomic command args to …

protocol-designer/src/steplist/formLevel/stepFormToArgs/moveLabwareFormToArgs.ts

@@ -1,3 +1,4 @@
+import type { LabwareMovementStrategy } from '@opentrons/shared-data'
 import type { HydratedMoveLabwareFormData } from '../../../form-types'
 import type { MoveLabwareArgs } from '@opentrons/step-generation'
 
@@ -16,8 +17,10 @@ export const moveLabwareFormToArgs = (
     commandCreatorFnName: 'moveLabware',
     name: stepName,
     description: stepDetails,
-    labware: labware.id,
-    useGripper,
+    labwareId: labware.id,
     newLocation,
+    strategy: useGripper
+      ? 'usingGripper'
+      : ('manualMoveWithPause' as LabwareMovementStrategy),
   }
 }

protocol-designer/src/steplist/formLevel/stepFormToArgs/pauseFormToArgs.ts

@@ -34,7 +34,7 @@ export const pauseFormToArgs = (
         commandCreatorFnName: 'delay',
         name: formData.stepName,
         description: formData.stepDetails ?? '',
-        wait: totalSeconds,
+        seconds: totalSeconds,
         message,
         meta: {
           hours,
@@ -48,7 +48,6 @@ export const pauseFormToArgs = (
         commandCreatorFnName: 'delay',
         name: formData.stepName,
         description: formData.stepDetails ?? '',
-        wait: true,
         message,
         meta: {
           hours,

protocol-designer/src/steplist/formLevel/stepFormToArgs/test/pauseFormToArgs.test.ts

@@ -41,7 +41,6 @@ describe('pauseFormToArgs', () => {
     const expected = {
       commandCreatorFnName: 'delay',
       name: 'pause step',
-      wait: true,
       message: 'some message',
       description: 'some details',
       meta: {
@@ -66,7 +65,7 @@ describe('pauseFormToArgs', () => {
     const expected = {
       commandCreatorFnName: 'delay',
       name: 'pause step',
-      wait: 3600 + 20 * 60 + 5,
+      seconds: 3600 + 20 * 60 + 5,
       message: 'some message',
       description: 'some details',
       meta: {

protocol-designer/src/timelineMiddleware/generateRobotStateTimeline.ts

@@ -8,6 +8,7 @@ import {
   reduceCommandCreators,
   commandCreatorsTimeline,
   getPipetteIdFromCCArgs,
+  ZERO_OFFSET,
 } from '@opentrons/step-generation'
 import { commandCreatorFromStepArgs } from '../file-data/helpers'
 import type { StepArgsAndErrorsById } from '../steplist/types'
@@ -95,6 +96,7 @@ export const generateRobotStateTimeline = (
             curryCommandCreator(moveToAddressableArea, {
               pipetteId,
               addressableAreaName,
+              offset: ZERO_OFFSET,
             }),
             curryCommandCreator(dropTipInPlace, {
               pipetteId,

protocol-designer/src/ui/steps/selectors.ts

@@ -154,7 +154,7 @@ export const getHoveredStepLabware = createSelector(
     }
 
     if (stepArgs.commandCreatorFnName === 'moveLabware') {
-      const src = stepArgs.labware
+      const src = stepArgs.labwareId
       return [src]
     }
 

protocol-designer/src/ui/steps/test/selectors.test.ts

@@ -25,6 +25,7 @@ import { getMockMoveLiquidStep, getMockMixStep } from '../__fixtures__'
 
 import * as utils from '../../modules/utils'
 
+import type { MoveLabwareArgs } from '@opentrons/step-generation'
 import type { FormData } from '../../../form-types'
 import type { StepArgsAndErrorsById } from '../../../steplist/types'
 import type { AllTemporalPropertiesForTimelineFrame } from '../../../step-forms'
@@ -46,7 +47,6 @@ function createArgsForStepId(
 const hoveredStepId = 'hoveredStepId'
 const labware = 'well plate'
 const mixCommand = 'mix'
-const moveLabwareCommand = 'moveLabware'
 describe('getHoveredStepLabware', () => {
   let initialDeckState: AllTemporalPropertiesForTimelineFrame
   beforeEach(() => {
@@ -135,9 +135,13 @@ describe('getHoveredStepLabware', () => {
   })
 
   it('correct labware is returned when command is moveLabware', () => {
-    const stepArgs = {
-      commandCreatorFnName: moveLabwareCommand,
-      labware,
+    const stepArgs: MoveLabwareArgs = {
+      labwareId: labware,
+      strategy: 'usingGripper',
+      newLocation: { slotName: 'A1' },
+      commandCreatorFnName: 'moveLabware',
+      name: 'some name',
+      description: 'some description',
     }
     const argsByStepId = createArgsForStepId(hoveredStepId, stepArgs)
     const result = getHoveredStepLabware.resultFunc(
@@ -146,7 +150,7 @@ describe('getHoveredStepLabware', () => {
       initialDeckState
     )
 
-    expect(result).toEqual([labware])
+    expect(result).toEqual([stepArgs.labwareId])
   })
 
   describe('modules', () => {

shared-data/command/types/annotation.ts

@@ -17,7 +17,7 @@ export interface CommentRunTimeCommand
   result?: any
 }
 
-interface CommentParams {
+export interface CommentParams {
   message: string
 }
 

shared-data/command/types/gantry.ts

@@ -163,7 +163,7 @@ interface RetractAxisParams {
   axis: MotorAxis
 }
 
-interface AddressableOffsetVector {
+export interface AddressableOffsetVector {
   x: number
   y: number
   z: number

shared-data/command/types/setup.ts

@@ -199,7 +199,7 @@ interface NozzleConfigurationParams {
   style: NozzleConfigurationStyle
 }
 
-interface ConfigureNozzleLayoutParams {
+export interface ConfigureNozzleLayoutParams {
   pipetteId: string
   configurationParams: NozzleConfigurationParams
 }

shared-data/command/types/timing.ts

@@ -22,7 +22,7 @@ export interface WaitForResumeRunTimeCommand
   result?: any
 }
 
-interface WaitForResumeParams {
+export interface WaitForResumeParams {
   message?: string
 }
 
@@ -37,7 +37,7 @@ export interface WaitForDurationRunTimeCommand
   result?: any
 }
 
-interface WaitForDurationParams {
+export interface WaitForDurationParams {
   seconds: number
   message?: string
 }