feat(protocol-designer, step-generation): wire up hover labware and remove duplicate btn (#13289)

closes RQA-1273 and RQA-1272

Author: jerader

protocol-designer/src/components/steplist/ContextMenu.tsx

@@ -11,6 +11,7 @@ import { actions as steplistActions } from '../../steplist'
 import { Portal } from '../portals/TopPortal'
 import styles from './StepItem.css'
 import { StepIdType } from '../../form-types'
+import { getSavedStepForms } from '../../step-forms/selectors'
 
 const MENU_OFFSET_PX = 5
 
@@ -47,6 +48,9 @@ export const ContextMenu = (props: Props): JSX.Element => {
   const menuRoot = React.useRef<HTMLDivElement | null>(null)
 
   const isMultiSelectMode = useSelector(getIsMultiSelectMode)
+  const allSavedSteps = useSelector(getSavedStepForms)
+  const isMoveLabwareStepType =
+    stepId != null ? allSavedSteps[stepId].stepType === 'moveLabware' : null
 
   React.useEffect(() => {
     global.addEventListener('click', handleClick)
@@ -78,7 +82,6 @@ export const ContextMenu = (props: Props): JSX.Element => {
     setStepId(stepId)
     setPosition({ left, top })
   }
-
   const handleClick = (event: MouseEvent): void => {
     const wasOutside = !(
       event.target instanceof Node && menuRoot.current?.contains(event.target)
@@ -128,24 +131,24 @@ export const ContextMenu = (props: Props): JSX.Element => {
       })}
       {!showDeleteConfirmation && visible && (
         <Portal>
-          <React.Fragment>
-            <div
-              ref={menuRoot}
-              // @ts-expect-error(sa, 2021-7-5): position cannot be null, cast to undefined
-              style={{ left: position.left, top: position.top }}
-              className={styles.context_menu}
-            >
+          <div
+            ref={menuRoot}
+            // @ts-expect-error(sa, 2021-7-5): position cannot be null, cast to undefined
+            style={{ left: position.left, top: position.top }}
+            className={styles.context_menu}
+          >
+            {isMoveLabwareStepType ? null : (
               <div
                 onClick={handleDuplicate}
                 className={styles.context_menu_item}
               >
                 {i18n.t('context_menu.step.duplicate')}
               </div>
-              <div onClick={confirmDelete} className={styles.context_menu_item}>
-                {i18n.t('context_menu.step.delete')}
-              </div>
+            )}
+            <div onClick={confirmDelete} className={styles.context_menu_item}>
+              {i18n.t('context_menu.step.delete')}
             </div>
-          </React.Fragment>
+          </div>
         </Portal>
       )}
     </div>

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

@@ -143,6 +143,11 @@ export const getHoveredStepLabware: Selector<string[]> = createSelector(
       return labware ? [labware.id] : []
     }
 
+    if (stepArgs.commandCreatorFnName === 'moveLabware') {
+      const src = stepArgs.labware
+      return [src]
+    }
+
     // step types that have no labware that gets highlighted
     if (!(stepArgs.commandCreatorFnName === 'delay')) {
       // TODO Ian 2018-05-08 use assert here

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

@@ -40,6 +40,7 @@ function createArgsForStepId(
 const hoveredStepId = 'hoveredStepId'
 const labware = 'well plate'
 const mixCommand = 'mix'
+const moveLabwareCommand = 'moveLabware'
 describe('getHoveredStepLabware', () => {
   let initialDeckState: any
   beforeEach(() => {
@@ -132,6 +133,22 @@ describe('getHoveredStepLabware', () => {
     expect(result).toEqual([labware])
   })
 
+  it('correct labware is returned when command is moveLabware', () => {
+    const stepArgs = {
+      commandCreatorFnName: moveLabwareCommand,
+      labware,
+    }
+    const argsByStepId = createArgsForStepId(hoveredStepId, stepArgs)
+    // @ts-expect-error(sa, 2021-6-15): resultFunc not part of Selector type
+    const result = getHoveredStepLabware.resultFunc(
+      argsByStepId,
+      hoveredStepId,
+      initialDeckState
+    )
+
+    expect(result).toEqual([labware])
+  })
+
   describe('modules', () => {
     const type = TEMPERATURE_MODULE_TYPE
     const setTempCommand = 'setTemperature'

step-generation/src/commandCreators/atomic/moveLabware.ts

@@ -43,7 +43,7 @@ export const moveLabware: CommandCreator<MoveLabwareArgs> = (
     ) {
       errors.push(errorCreators.thermocyclerLidClosed())
     } else if (initialModuleState.type === HEATERSHAKER_MODULE_TYPE) {
-      if (initialModuleState.latchOpen === false) {
+      if (initialModuleState.latchOpen !== true) {
         errors.push(errorCreators.heaterShakerLatchClosed())
       } else if (initialModuleState.targetSpeed !== null) {
         errors.push(errorCreators.heaterShakerIsShaking())