address more feedback

Author: jerader

protocol-designer/src/components/organisms/SlotDetailsContainer/index.tsx

@@ -6,7 +6,6 @@ import {
   FAKE_HOPPER_LOCATION_MAP,
   getIsSlotAHopper,
   getTopLocationInStack,
-  HopperLocationMapKey,
 } from '@opentrons/step-generation'
 
 import { getLiquidEntities } from '/protocol-designer/step-forms/selectors'
@@ -18,6 +17,7 @@ import { getFullStackFromLabwaresOnDeck } from '/protocol-designer/utils'
 import { SlotInformation } from '../SlotInformation'
 
 import type { DeckSlotId, RobotType } from '@opentrons/shared-data'
+import type { HopperLocationMapKey } from '@opentrons/step-generation'
 import type { ContentsByWell } from '/protocol-designer/labware-ingred/types'
 
 interface SlotDetailContainerProps {

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

@@ -167,7 +167,7 @@ export function DeckSetupContainer(
     const zoomInSlotPosition = getPositionFromSlotId(
       slot ?? '',
       deckDef,
-      isOnHopper ? HOPPER_ZOOM_OFFSET_POSTITION : undefined
+      ...(isOnHopper ? [HOPPER_ZOOM_OFFSET_POSTITION] : [])
     )
     if (zoomInSlotPosition != null) {
       const zoomedInViewBox = zoomInOnCoordinate({

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

@@ -63,6 +63,7 @@ export function HighlightItems(props: HighlightItemsProps): JSX.Element | null {
   )
   const hoveredItem = useSelector(getHoveredDropdownItem)
   const selectedDropdownItems = useSelector(getSelectedDropdownItem)
+
   if (
     hoveredItem == null &&
     (selectedDropdownItems == null || selectedDropdownItems.length === 0)

protocol-designer/src/pages/Designer/utils.ts

@@ -107,11 +107,11 @@ export const getSlotInformation = (
     : slot
   const slotPosition =
     deckDef != null && offDeckLabware == null
-      ? (getPositionFromSlotId(
+      ? getPositionFromSlotId(
           adjustedSlot,
           deckDef,
-          isSlotAHopper ? HOPPER_LABWARE_X_OFFSET : undefined
-        ) ?? null)
+          ...(isSlotAHopper ? [HOPPER_LABWARE_X_OFFSET] : [])
+        )
       : null
   const createdModuleForSlot = Object.values(deckSetupModules).find(
     module => module.slot === adjustedSlot

protocol-designer/src/step-forms/actions/thunks.ts

@@ -36,6 +36,7 @@ export const createContainerAboveModule: (
   const state = getState()
   const deckSetup = getDeckSetupForActiveItem(state)
   const modules = deckSetup.modules
+
   const moduleId = Object.values(modules).find(
     module => module.slot === slot
   )?.id

protocol-designer/src/utils/index.ts

@@ -369,25 +369,25 @@ export function getLocationStackTopToBottom(
   moduleEntities: ModuleEntities
 ): string[] {
   const stack: string[] = []
-  let current = labwareId
-
-  while (true) {
+  const visited = new Set<string>()
+  let current: string | undefined = labwareId
+  while (current != null) {
+    // Cycle detection: if we've seen this node before, break to prevent infinite loop
+    if (visited.has(current)) {
+      break
+    }
+    visited.add(current)
     stack.push(current)
-
-    const slot = labwareLocationUpdate[current]
-    const parent = slot ?? moduleLocationUpdate[current]
+    const slot: string | undefined = labwareLocationUpdate[current]
+    const parent: string | undefined = slot ?? moduleLocationUpdate[current]
     const isOnHopper =
       moduleEntities[slot] != null &&
       moduleEntities[slot].type === FLEX_STACKER_MODULE_TYPE
-
     if (isOnHopper) {
       // Hopper stack shape: [labware, hopper, moduleId, slot]
       // So when the node is on the hopper, insert the hopper marker once
       stack.push(HOPPER_STACKER_LOCATION)
     }
-
-    if (!parent) break
-
     current = parent
   }
   return stack
@@ -403,8 +403,8 @@ export const getLabwaresOnModuleFromStack = (
 } => {
   // all stacks involving this module and not on the hopper if its a flex stacker
   const allStacks = labware.filter(
-    lw =>
-      lw.stack.includes(moduleId) && !lw.stack.includes(HOPPER_STACKER_LOCATION)
+    ({ stack }) =>
+      stack.includes(moduleId) && !stack.includes(HOPPER_STACKER_LOCATION)
   )
   const largestStack = allStacks.sort(
     (a, b) => b.stack.length - a.stack.length
@@ -415,8 +415,8 @@ export const getLabwaresOnModuleFromStack = (
   )
   // all stacks involving the hopper if there is one
   const allStacksOnHopper = labware.filter(
-    lw =>
-      lw.stack.includes(moduleId) && lw.stack.includes(HOPPER_STACKER_LOCATION)
+    ({ stack }) =>
+      stack.includes(moduleId) && stack.includes(HOPPER_STACKER_LOCATION)
   )
   const largestStackOnHopper = allStacksOnHopper.sort(
     (a, b) => b.stack.length - a.stack.length
@@ -438,11 +438,9 @@ export const getFullStackFromLabwaresOnDeck = (
     : slot
   return labwareOnDeck
     .filter(
-      lw =>
-        lw.stack.includes(slotInStack) &&
-        (onHopper
-          ? lw.stack.includes(HOPPER_STACKER_LOCATION)
-          : !lw.stack.includes(HOPPER_STACKER_LOCATION))
+      ({ stack }) =>
+        stack.includes(slotInStack) &&
+        onHopper === stack.includes(HOPPER_STACKER_LOCATION)
     )
     .sort((a, b) => b.stack.length - a.stack.length)[0]?.stack
 }

step-generation/src/types.ts

@@ -634,26 +634,56 @@ export interface CaptureImageArgs extends CommonArgs {
   saturation: number
 }
 
+export interface FlexStackerStore extends CommonArgs {
+  moduleId: string
+  commandCreatorFnName: 'flexStackerStore'
+}
+
+export interface FlexStackerRetrieve extends CommonArgs {
+  moduleId: string
+  commandCreatorFnName: 'flexStackerRetrieve'
+}
+
+export interface FlexStackerEmpty extends CommonArgs {
+  moduleId: string
+  commandCreatorFnName: 'flexStackerEmpty'
+  interventionMessage: string | null
+}
+
+export interface FlexStackerFillItems extends CommonArgs {
+  moduleId: string
+  commandCreatorFnName: 'flexStackerFillItems'
+  fillLabwareUri: string | null
+  fillQuantity: number | null
+}
+
+export type FlexStackerArgs =
+  | FlexStackerStore
+  | FlexStackerRetrieve
+  | FlexStackerEmpty
+  | FlexStackerFillItems
+
 export type CommandCreatorArgs =
   | AbsorbanceReaderInitializeArgs
-  | AbsorbanceReaderReadArgs
   | AbsorbanceReaderLidArgs
-  | ConsolidateArgs
+  | AbsorbanceReaderReadArgs
   | CaptureImageArgs
+  | CommentArgs
+  | ConsolidateArgs
+  | DeactivateTemperatureArgs
+  | DisengageMagnetArgs
   | DistributeArgs
+  | EngageMagnetArgs
+  | FlexStackerArgs
+  | HeaterShakerArgs
   | MixArgs
+  | MoveLabwareArgs
   | PauseArgs
-  | TransferArgs
-  | EngageMagnetArgs
-  | DisengageMagnetArgs
   | SetTemperatureArgs
-  | WaitForTemperatureArgs
-  | DeactivateTemperatureArgs
   | ThermocyclerProfileStepArgs
   | ThermocyclerStateStepArgs
-  | HeaterShakerArgs
-  | MoveLabwareArgs
-  | CommentArgs
+  | TransferArgs
+  | WaitForTemperatureArgs
 
 export interface LocationLiquidState {
   [ingredGroup: string]: { volume: number }