fix(app): fix multi-location tip selection during error recovery

Opentrons · Feb 6, 2025 · 5546936 · 5546936
1 parent d0ff21c
commit 5546936
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/app/src/organisms/ErrorRecoveryFlows/shared/TipSelection.tsx b/app/src/organisms/ErrorRecoveryFlows/shared/TipSelection.tsx
@@ -37,6 +37,7 @@ export function TipSelection(props: TipSelectionProps): JSX.Element {
         relevantActiveNozzleLayout
       )}
       allowSelect={allowTipSelection}
+      allowMultiDrag={false}
     />
   )
 }

diff --git a/app/src/organisms/ErrorRecoveryFlows/shared/__tests__/TipSelection.test.tsx b/app/src/organisms/ErrorRecoveryFlows/shared/__tests__/TipSelection.test.tsx
@@ -42,6 +42,7 @@ describe('TipSelection', () => {
         channels:
           props.failedPipetteUtils.failedPipetteInfo?.data.channels ?? 1,
         allowSelect: props.allowTipSelection,
+        allowMultiDrag: false,
         pipetteNozzleDetails: undefined,
       }),
       {}

diff --git a/app/src/organisms/WellSelection/index.tsx b/app/src/organisms/WellSelection/index.tsx
@@ -29,6 +29,8 @@ interface WellSelectionProps {
   pipetteNozzleDetails?: NozzleLayoutDetails
   /* Whether highlighting and selectWells() updates are permitted. */
   allowSelect?: boolean
+  /* Whether selecting multiple rows is permitted. */
+  allowMultiDrag?: boolean
 }
 
 export function WellSelection(props: WellSelectionProps): JSX.Element {
@@ -40,6 +42,7 @@ export function WellSelection(props: WellSelectionProps): JSX.Element {
     channels,
     pipetteNozzleDetails,
     allowSelect = true,
+    allowMultiDrag = true,
   } = props
   const [highlightedWells, setHighlightedWells] = useState<WellGroup>({})
 
@@ -61,8 +64,11 @@ export function WellSelection(props: WellSelectionProps): JSX.Element {
           })
           if (!wellSet) {
             return acc
+          } else if (allowMultiDrag) {
+            return { ...acc, [wellSet[0]]: null }
+          } else {
+            return { [wellSet[0]]: null }
           }
-          return { ...acc, [wellSet[0]]: null }
         },
         {}
       )
-Original file line number
+Diff line change
@@ Expand Up @@
             relevantActiveNozzleLayout
           )}
           allowSelect={allowTipSelection}
+          allowMultiDrag={false}
         />
       )
     }
@@ Expand Down @@