Merge remote-tracking branch 'origin/chore_release-pd-8.8.0' into temp-880-into-900

Author: jerader

protocol-designer/src/pages/Designer/DeckSetup/DeckSetupToolbox.tsx

@@ -138,7 +138,17 @@ export function DeckSetupToolbox(
     (createdAdapterForSlot == null && createdStackForSlot.length === 0) ||
     (createdStackForSlot.length === 0 && deckSetup.labware[slot] != null)
   const handleClear = (): void => {
-    if (slot !== 'offDeck' && offDeckLabware == null) {
+    if (isHopperSlot) {
+      const labwareIdsToDelete = (labwareInHopper ?? []).reduce<string[]>(
+        (acc, group) => {
+          return [...acc, ...Object.values(group).filter(id => id != null)]
+        },
+        []
+      )
+      labwareIdsToDelete.forEach(labwareId => {
+        dispatch(deleteContainer({ labwareId: labwareId }))
+      })
+    } else if (slot !== 'offDeck' && offDeckLabware == null) {
       if (createdAdapterForSlot != null) {
         dispatch(deleteContainer({ labwareId: createdAdapterForSlot.id }))
       }

protocol-designer/src/pages/Designer/ProtocolSteps/StepForm/PipetteFields/PartialTipField.tsx

@@ -3,9 +3,9 @@ import { useTranslation } from 'react-i18next'
 import { useSelector } from 'react-redux'
 
 import { DropdownMenu, Flex, SPACING } from '@opentrons/components'
-import { ALL, COLUMN, SINGLE } from '@opentrons/shared-data'
+import { ALL, COLUMN, getIsTiprack, SINGLE } from '@opentrons/shared-data'
 
-import { getInitialDeckSetup } from '/protocol-designer/step-forms/selectors'
+import { getDeckSetupForActiveItem } from '/protocol-designer/top-selectors/labware-locations'
 
 import type { DropdownOption } from '@opentrons/components'
 import type { PipetteV2Specs } from '@opentrons/shared-data'
@@ -24,12 +24,10 @@ export function PartialTipField(props: PartialTipFieldProps): JSX.Element {
     pipetteSpecs,
   } = props
   const { t } = useTranslation('protocol_steps')
-  const deckSetup = useSelector(getInitialDeckSetup)
+  const { labware } = useSelector(getDeckSetupForActiveItem)
   const { channels } = pipetteSpecs
 
-  const tipracks = Object.values(deckSetup.labware).filter(
-    labware => labware.def.parameters.isTiprack
-  )
+  const tipracks = Object.values(labware).filter(({ def }) => getIsTiprack(def))
   const tipracksNotOnAdapter = tipracks.filter(
     tiprack => tiprack.stack.length === 2
   )

protocol-designer/src/utils/index.ts

@@ -436,13 +436,15 @@ export const getFullStackFromLabwaresOnDeck = (
   const slotInStack = onHopper
     ? FAKE_HOPPER_LOCATION_MAP[slot as HopperLocationMapKey]
     : slot
-  return labwareOnDeck
-    .filter(
-      ({ stack }) =>
-        stack.includes(slotInStack as string) &&
-        onHopper === stack.includes(HOPPER_STACKER_LOCATION)
-    )
-    .sort((a, b) => b.stack.length - a.stack.length)[0]?.stack
+  return (
+    labwareOnDeck
+      .filter(
+        ({ stack }) =>
+          stack.includes(slotInStack as string) &&
+          onHopper === stack.includes(HOPPER_STACKER_LOCATION)
+      )
+      .sort((a, b) => b.stack.length - a.stack.length)[0]?.stack ?? []
+  )
 }
 
 export const getModuleIdFromStack = (

step-generation/src/getNextRobotStateAndWarnings/__tests__/stackerUpdates.test.ts

@@ -257,7 +257,6 @@ describe('flex stacker state updates forFlexStackerStore', () => {
       'tiprack4Id',
       HOPPER_STACKER_LOCATION,
       FLEX_STACKER_ID,
-      '1',
     ])
   })
 })

step-generation/src/getNextRobotStateAndWarnings/forMoveLabware.ts

@@ -51,6 +51,26 @@ export function forMoveLabware(
       return type === FLEX_STACKER_MODULE_TYPE && slot === initialDeckSlot
     }) ?? null
 
+  const movedStackFromShuttle =
+    initialShuttleParentStackerState != null &&
+    initialShuttleParentStackerState[1].moduleState.type ===
+      FLEX_STACKER_MODULE_TYPE
+      ? BOTTOM_UP_LABWARE_POOL_KEYS.map(
+          key =>
+            (
+              initialShuttleParentStackerState[1]
+                .moduleState as FlexStackerModuleState
+            ).labwareOnShuttle?.[key]
+        ).filter((id): id is string => id != null)
+      : []
+
+  const movedStackUpToTarget = movedStackFromShuttle.includes(labwareId)
+    ? movedStackFromShuttle.slice(
+        0,
+        movedStackFromShuttle.indexOf(labwareId) + 1
+      )
+    : []
+
   if (
     initialShuttleParentStackerState != null &&
     initialShuttleParentStackerState[1].moduleState.type ===
@@ -90,7 +110,10 @@ export function forMoveLabware(
     }) ?? null
   const [newModuleId, newStackerOnDeck] = newShuttleParentStackerState ?? []
   if (newModuleId != null && newStackerOnDeck != null) {
-    const fullStack = getLargestStackInSlot(labware, initialDeckSlot)
+    const fullStack =
+      movedStackUpToTarget.length > 0
+        ? movedStackUpToTarget
+        : getLargestStackInSlot(labware, initialDeckSlot)
     const stackIndexOfTarget = fullStack.indexOf(labwareId)
     const moduleState = newStackerOnDeck.moduleState as FlexStackerModuleState
     if (stackIndexOfTarget !== -1) {

step-generation/src/getNextRobotStateAndWarnings/stackerUpdates.ts

@@ -580,7 +580,6 @@ export const forFlexStackerStore = (
 ): void => {
   const { robotState } = robotStateAndWarnings
   const { moduleId } = params
-  const moduleSlot = robotState.modules[moduleId].slot
   const moduleState = flexStackerStateGetter(robotState, moduleId)
   if (moduleState != null) {
     const { labwareOnShuttle } = moduleState
@@ -603,7 +602,6 @@ export const forFlexStackerStore = (
             labwareId,
             HOPPER_STACKER_LOCATION,
             moduleId,
-            moduleSlot,
           ]
         }
       }