refactor(protocol-designer): misc staging area slot bugs addressing (#…

…14161) closes RQA-2050 RQA-2051 RQA-2057
Opentrons · Dec 12, 2023 · a32571e · a32571e
1 parent 918284a
commit a32571e
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 41 deletions.
diff --git a/protocol-designer/src/components/DeckSetup/index.tsx b/protocol-designer/src/components/DeckSetup/index.tsx
@@ -550,7 +550,8 @@ export const DeckSetup = (): JSX.Element => {
     aE =>
       STAGING_AREA_CUTOUTS.includes(aE.location as CutoutId) &&
       aE.name === 'stagingArea' &&
-      aE.location === WASTE_CHUTE_CUTOUT
+      aE.location === WASTE_CHUTE_CUTOUT &&
+      wasteChuteFixtures.length > 0
   )
 
   const hasWasteChute =

diff --git a/protocol-designer/src/components/modules/StagingAreasModal.tsx b/protocol-designer/src/components/modules/StagingAreasModal.tsx
@@ -10,11 +10,11 @@ import {
   DIRECTION_ROW,
   Box,
   Text,
-  JUSTIFY_CENTER,
   ALIGN_CENTER,
   JUSTIFY_FLEX_END,
   JUSTIFY_END,
   DeckConfigurator,
+  DIRECTION_COLUMN,
 } from '@opentrons/components'
 import {
   CutoutId,
@@ -120,11 +120,12 @@ const StagingAreasModalComponent = (
 
   return (
     <Form>
-      <Box paddingX={SPACING.spacing32}>
+      <Flex height="20rem" flexDirection={DIRECTION_COLUMN}>
         <Flex
           justifyContent={JUSTIFY_END}
           alignItems={ALIGN_CENTER}
-          height="3.125rem"
+          height="4rem"
+          paddingX={SPACING.spacing32}
         >
           <Box>
             {hasConflictedSlot ? (
@@ -138,19 +139,12 @@ const StagingAreasModalComponent = (
             ) : null}
           </Box>
         </Flex>
-
-        <Flex
-          height="20rem"
-          marginTop="-2.5rem"
-          justifyContent={JUSTIFY_CENTER}
-        >
-          <DeckConfigurator
-            deckConfig={updatedSlots}
-            handleClickAdd={handleClickAdd}
-            handleClickRemove={handleClickRemove}
-          />
-        </Flex>
-      </Box>
+        <DeckConfigurator
+          deckConfig={updatedSlots}
+          handleClickAdd={handleClickAdd}
+          handleClickRemove={handleClickRemove}
+        />
+      </Flex>
       <Flex
         flexDirection={DIRECTION_ROW}
         justifyContent={JUSTIFY_FLEX_END}

diff --git a/protocol-designer/src/ui/labware/selectors.ts b/protocol-designer/src/ui/labware/selectors.ts
@@ -2,15 +2,12 @@ import { createSelector } from 'reselect'
 import mapValues from 'lodash/mapValues'
 import reduce from 'lodash/reduce'
 import { getIsTiprack, getLabwareDisplayName } from '@opentrons/shared-data'
-import {
-  AdditionalEquipmentEntity,
-  COLUMN_4_SLOTS,
-} from '@opentrons/step-generation'
+import { AdditionalEquipmentEntity } from '@opentrons/step-generation'
 import { i18n } from '../../localization'
 import * as stepFormSelectors from '../../step-forms/selectors'
 import { selectors as labwareIngredSelectors } from '../../labware-ingred/selectors'
 import { getModuleUnderLabware } from '../modules/utils'
-import { getLabwareOffDeck } from './utils'
+import { getLabwareOffDeck, getLabwareInColumn4 } from './utils'
 
 import type { LabwareEntity } from '@opentrons/step-generation'
 import type { DropdownOption, Options } from '@opentrons/components'
@@ -82,23 +79,6 @@ export const getLabwareOptions: Selector<Options> = createSelector(
           savedStepForms ?? {},
           labwareId
         )
-        const isStartingInColumn4 = COLUMN_4_SLOTS.includes(
-          initialDeckSetup.labware[labwareId]?.slot
-        )
-
-        const isInColumn4 =
-          savedStepForms != null
-            ? Object.values(savedStepForms)
-                ?.reverse()
-                .some(
-                  form =>
-                    form.stepType === 'moveLabware' &&
-                    form.labware === labwareId &&
-                    (COLUMN_4_SLOTS.includes(form.newLocation) ||
-                      (isStartingInColumn4 &&
-                        !COLUMN_4_SLOTS.includes(form.newLocation)))
-                )
-            : false
 
         const isAdapterOrAluminumBlock =
           isAdapter ||
@@ -116,12 +96,18 @@ export const getLabwareOptions: Selector<Options> = createSelector(
               )
             : null
 
+        const isLabwareInColumn4 = getLabwareInColumn4(
+          initialDeckSetup,
+          savedStepForms ?? {},
+          labwareId
+        )
+
         let nickName = nicknamesById[labwareId]
         if (module != null) {
           nickName = `${nicknamesById[labwareId]} in ${module}`
         } else if (isOffDeck) {
-          nickName = `Off-deck - ${nicknamesById[labwareId]}`
-        } else if (isInColumn4) {
+          nickName = `${nicknamesById[labwareId]} off-deck`
+        } else if (isLabwareInColumn4) {
           nickName = `${nicknamesById[labwareId]} in staging area slot`
         }
 

diff --git a/protocol-designer/src/ui/labware/utils.ts b/protocol-designer/src/ui/labware/utils.ts
@@ -1,3 +1,4 @@
+import { COLUMN_4_SLOTS } from '@opentrons/step-generation'
 import type { InitialDeckSetup, SavedStepFormState } from '../../step-forms'
 
 export function getLabwareOffDeck(
@@ -24,3 +25,33 @@ export function getLabwareOffDeck(
     return true
   } else return false
 }
+
+export function getLabwareInColumn4(
+  initialDeckSetup: InitialDeckSetup,
+  savedStepForms: SavedStepFormState,
+  labwareId: string
+): boolean {
+  const isStartingInColumn4 = COLUMN_4_SLOTS.includes(
+    initialDeckSetup.labware[labwareId]?.slot
+  )
+  //  latest moveLabware step related to labwareId
+  const moveLabwareStep = Object.values(savedStepForms)
+    .filter(
+      state =>
+        state.stepType === 'moveLabware' &&
+        labwareId != null &&
+        labwareId === state.labware
+    )
+    .reverse()[0]
+
+  if (
+    moveLabwareStep?.newLocation != null &&
+    COLUMN_4_SLOTS.includes(moveLabwareStep.newLocation)
+  ) {
+    return true
+  } else if (moveLabwareStep == null && isStartingInColumn4) {
+    return true
+  } else {
+    return false
+  }
+}