fix(protocol-designer): candidate-C bug addressing and don't unnecess…

…arily migrate closes RQA-2772 RQA-2773 RQA-2776
Opentrons · May 23, 2024 · 91d38c1 · 91d38c1
1 parent d5eb9c7
commit 91d38c1
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/protocol-designer/src/components/FileSidebar/utils/getUnusedTrash.ts b/protocol-designer/src/components/FileSidebar/utils/getUnusedTrash.ts
@@ -38,13 +38,17 @@ export const getUnusedTrash = (
     wasteChute != null
       ? commands?.some(
           command =>
-            command.commandType === 'moveToAddressableArea' &&
-            WASTE_CHUTE_ADDRESSABLE_AREAS.includes(
-              command.params.addressableAreaName as AddressableAreaName
-            )
+            (command.commandType === 'moveToAddressableArea' &&
+              WASTE_CHUTE_ADDRESSABLE_AREAS.includes(
+                command.params.addressableAreaName as AddressableAreaName
+              )) ||
+            (command.commandType === 'moveLabware' &&
+              command.params.newLocation !== 'offDeck' &&
+              'addressableAreaName' in command.params.newLocation &&
+              command.params.newLocation.addressableAreaName ===
+                'gripperWasteChute')
         )
       : null
-
   return {
     trashBinUnused: trashBin != null && !hasTrashBinCommands,
     wasteChuteUnused: wasteChute != null && !hasWasteChuteCommands,

diff --git a/protocol-designer/src/components/modals/CreateFileWizard/index.tsx b/protocol-designer/src/components/modals/CreateFileWizard/index.tsx
@@ -121,6 +121,7 @@ export function CreateFileWizard(): JSX.Element | null {
       values.pipettesByMount,
       (acc, formPipette: FormPipette, mount): PipetteFieldsData[] => {
         return formPipette?.pipetteName != null &&
+          formPipette?.pipetteName !== '' &&
           formPipette.tiprackDefURI != null &&
           (mount === 'left' || mount === 'right')
           ? [

diff --git a/protocol-designer/src/load-file/migration/index.ts b/protocol-designer/src/load-file/migration/index.ts
@@ -27,7 +27,11 @@ export const getMigrationVersionsToRunFromVersion = (
   const allSortedVersions = Object.keys(migrationsByVersion).sort(
     semver.compare
   )
-  return takeRightWhile(allSortedVersions, v => semver.gt(v, version))
+
+  return takeRightWhile(
+    allSortedVersions,
+    v => semver.gt(v, version) && !version.includes(v)
+  )
 }
 
 const allMigrationsByVersion: MigrationsByVersion = {

diff --git a/protocol-designer/src/step-forms/reducers/index.ts b/protocol-designer/src/step-forms/reducers/index.ts
@@ -1355,10 +1355,9 @@ export const additionalEquipmentInvariantProperties = handleActions<NormalizedAd
             command.params.newLocation !== 'offDeck' &&
             'addressableAreaName' in command.params.newLocation &&
             WASTE_CHUTE_ADDRESSABLE_AREAS.includes(
-              command.params.addressableAreaName
+              command.params.newLocation.addressableAreaName
             ))
       )
-
       const getStagingAreaSlotNames = (
         commandType: 'moveLabware' | 'loadLabware',
         locationKey: 'newLocation' | 'location'
@@ -1519,6 +1518,9 @@ export const additionalEquipmentInvariantProperties = handleActions<NormalizedAd
         ) {
           wasteChuteId = moveLiquidStepWasteChute.blowOut_location
         }
+        //  new wasteChuteId generated for if there are only moveLabware commands
+      } else if (hasWasteChuteCommands && moveLiquidStepWasteChute == null) {
+        wasteChuteId = `${uuid()}:wasteChute`
       }
 
       const wasteChute =