refactor labwareLocationUpdate

Author: jerader

protocol-designer/src/labware-ingred/__tests__/actions.test.ts

@@ -122,7 +122,6 @@ describe('createContainer', () => {
           labwareDefURI: 'someLabwareDefURI',
           slot: '4',
           displayCategory: 'wellPlate',
-          isOnHopper: false,
         },
       },
     ]
@@ -169,7 +168,6 @@ describe('createContainer', () => {
           labwareDefURI: 'someLabwareDefURI',
           slot: '3',
           displayCategory: 'wellPlate',
-          isOnHopper: false,
         },
       },
     ]
@@ -266,7 +264,6 @@ describe('createContainer', () => {
           labwareDefURI: 'someLabwareDefURI',
           slot: '4',
           displayCategory: 'tipRack',
-          isOnHopper: false,
         },
       },
       {

protocol-designer/src/labware-ingred/actions/actions.ts

@@ -79,7 +79,6 @@ export interface CreateContainerArgs {
   // NOTE: if slot is omitted, next available slot will be used.
   slot?: DeckSlot
   updateSelectedLabwareId?: boolean
-  isOnHopper?: boolean
 }
 
 export interface CreateContainerAction {
@@ -89,7 +88,6 @@ export interface CreateContainerAction {
     slot: DeckSlot
     id: string
     displayCategory: LabwareDisplayCategory
-    isOnHopper: boolean
   }
 }
 export interface DeleteContainerAction {
@@ -126,7 +124,6 @@ export interface DuplicateLabwareAction {
     duplicateLabwareNickname: string
     slot: DeckSlot
     displayCategory: LabwareDisplayCategory
-    isOnHopper: boolean
   }
 }
 

protocol-designer/src/labware-ingred/actions/thunks.ts

@@ -63,7 +63,7 @@ export const createContainer: (
   | ZoomedIntoSlotAction
   | OpenIngredientSelectorAction
 > = args => (dispatch, getState) => {
-  const { labwareDefURIStack, slot, updateSelectedLabwareId, isOnHopper } = args
+  const { labwareDefURIStack, slot, updateSelectedLabwareId } = args
   const state = getState()
   const initialDeckSetup = stepFormSelectors.getInitialDeckSetup(state)
   const robotType = getRobotType(state)
@@ -89,7 +89,6 @@ export const createContainer: (
           labwareDefURI: labwareUri,
           slot: currentSlot,
           displayCategory: labwareDisplayCategory,
-          isOnHopper: isOnHopper ?? false,
         },
       })
 
@@ -126,12 +125,11 @@ export const createContainer: (
 
 interface DuplicateLabwareProps {
   templateLabwareIds: string[]
-  isOnHopper?: boolean
 }
 export const duplicateLabware: (
   props: DuplicateLabwareProps
 ) => ThunkAction<DuplicateLabwareAction> = args => (dispatch, getState) => {
-  const { isOnHopper, templateLabwareIds } = args
+  const { templateLabwareIds } = args
   const state = getState()
   const robotType = state.fileData.robotType
   const labwareEntities = stepFormSelectors.getLabwareEntities(state)
@@ -186,7 +184,6 @@ export const duplicateLabware: (
         duplicateLabwareId,
         slot,
         displayCategory,
-        isOnHopper: isOnHopper ?? false,
       },
     })
 

protocol-designer/src/load-file/migration/8_8_0.ts

@@ -19,7 +19,6 @@ import { migrateFile as migrateFileEightFive } from './8_5_0'
 import { migrateFile as migrateFileEightFiveFive } from './8_5_5'
 import { migrateFile as migrateFileEightSix } from './8_6_0'
 import { migrateFile as migrateFileEightSeven } from './8_7_0'
-import { migrateFile as migrateFileEightEight } from './8_8_0'
 
 import type {
   PDProtocolFile,
@@ -78,8 +77,6 @@ const allMigrationsByVersion: MigrationsByVersion = {
   '8.6.0': migrateFileEightSix,
   // @ts-expect-error
   '8.7.0': migrateFileEightSeven,
-  // @ts-expect-error
-  '8.8.0': migrateFileEightEight,
 }
 export const migration = (
   file: any

protocol-designer/src/load-file/migration/index.ts

@@ -19,7 +19,10 @@ import {
   Toolbox,
   TYPOGRAPHY,
 } from '@opentrons/components'
-import { ABSORBANCE_READER_V1 } from '@opentrons/shared-data'
+import {
+  ABSORBANCE_READER_V1,
+  FLEX_STACKER_MODULE_V1,
+} from '@opentrons/shared-data'
 import {
   getIsSlotAHopper,
   HOPPER_LOCATION_MAP,
@@ -151,12 +154,15 @@ export function DeckSetupToolbox(
     const isOffDeck = slot === 'offDeck'
     const hasModule = selectedModuleModel != null
     const isHopperSlot = getIsSlotAHopper(slot)
+    const isOnShuttle =
+      !isHopperSlot && selectedModuleModel === FLEX_STACKER_MODULE_V1
 
     //  handle clear for if you are changing the adapter/labware combo
     if (!isOffDeck) {
       handleClear()
     }
-    if (hasModule) {
+    //  NOTE: labware on the Flex Stacker shuttle is not on any module ;)
+    if (hasModule && !isOnShuttle) {
       dispatch(
         createContainerAboveModule({
           slot: isHopperSlot
@@ -169,7 +175,6 @@ export function DeckSetupToolbox(
               : []),
             ...(selectedLidLabware != null ? [selectedLidLabware] : []),
           ],
-          isOnHopper: isHopperSlot,
         })
       )
     } else {

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

@@ -17,7 +17,6 @@ import {
 } from '@opentrons/components'
 import {
   getFullStackFromLabwares,
-  getIsSlotAHopper,
   getTopLocationInStack,
 } from '@opentrons/step-generation'
 
@@ -82,7 +81,6 @@ export function SlotOverflowMenu(
     invertY = false,
   } = props
   const { t } = useTranslation('starting_deck_state')
-  const isOnHopper = getIsSlotAHopper(location)
   const savedSteps = useSelector(getSavedStepForms)
   const dispatch = useDispatch<ThunkDispatch<any>>()
   const [showDeleteLabwareModal, setShowDeleteLabwareModal] =
@@ -140,9 +138,7 @@ export function SlotOverflowMenu(
       makeSnackbar(t('deck_slots_full') as string)
       return
     }
-    dispatch(
-      duplicateLabware({ templateLabwareIds: labwareStackOnSlot, isOnHopper })
-    )
+    dispatch(duplicateLabware({ templateLabwareIds: labwareStackOnSlot }))
     setShowMenuList(false)
   }
 

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

@@ -22,7 +22,6 @@ import type { CreateModuleAction } from './modules'
 export interface CreateContainerAboveModuleArgs {
   slot: DeckSlotId
   labwareDefURIStack: string[]
-  isOnHopper: boolean
 }
 
 export const createContainerAboveModule: (
@@ -33,7 +32,7 @@ export const createContainerAboveModule: (
   | ZoomedIntoSlotAction
   | OpenIngredientSelectorAction
 > = args => (dispatch, getState) => {
-  const { slot, labwareDefURIStack, isOnHopper } = args
+  const { slot, labwareDefURIStack } = args
   const state = getState()
   const deckSetup = getDeckSetupForActiveItem(state)
   const modules = deckSetup.modules
@@ -44,7 +43,6 @@ export const createContainerAboveModule: (
     createContainer({
       slot: moduleId,
       labwareDefURIStack,
-      isOnHopper,
     })
   )
 }