Add stacker options separately to fixture modal

Opentrons · Jan 29, 2025 · 8853ec8 · 8853ec8
1 parent 444b197
commit 8853ec8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 23 deletions.
diff --git a/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx b/app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx
@@ -257,26 +257,33 @@ export function AddFixtureModal({
       cutoutId === 'cutoutD3' &&
       unconfiguredMods.some(m => m.moduleModel === FLEX_STACKER_MODULE_V1)
     ) {
-      const unconfiguredFlexStackers = unconfiguredMods
+      const unconfiguredFlexStackers: CutoutConfig[][] = []
+      unconfiguredMods
         .filter(mod => mod.moduleModel === FLEX_STACKER_MODULE_V1)
-        .map(mod => [
-          {
-            cutoutId,
-            cutoutFixtureId: FLEX_STACKER_V1_FIXTURE,
-            opentronsModuleSerialNumber: mod.serialNumber,
-          },
-          {
-            cutoutId,
-            cutoutFixtureId: FLEX_STACKER_WITH_WASTE_CHUTE_ADAPTER_COVERED_FIXTURE,
-            opentronsModuleSerialNumber: mod.serialNumber,
-          },
-          {
-            cutoutId,
-            cutoutFixtureId: FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE,
-            opentronsModuleSerialNumber: mod.serialNumber,
-          },
-        ])
-      availableOptions = [...availableOptions, ...unconfiguredFlexStackers]
+        .forEach(mod => {
+          unconfiguredFlexStackers.push([
+            {
+              cutoutId,
+              cutoutFixtureId: FLEX_STACKER_V1_FIXTURE,
+              opentronsModuleSerialNumber: mod.serialNumber,
+            },
+          ])
+          unconfiguredFlexStackers.push([
+            {
+              cutoutId,
+              cutoutFixtureId: FLEX_STACKER_WITH_WASTE_CHUTE_ADAPTER_COVERED_FIXTURE,
+              opentronsModuleSerialNumber: mod.serialNumber,
+            },
+          ])
+          unconfiguredFlexStackers.push([
+            {
+              cutoutId,
+              cutoutFixtureId: FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE,
+              opentronsModuleSerialNumber: mod.serialNumber,
+            },
+          ])
+        })
+      availableOptions.push(...unconfiguredFlexStackers)
     } else if (
       STAGING_AREA_CUTOUTS.includes(cutoutId) &&
       unconfiguredMods.some(m => m.moduleModel === FLEX_STACKER_MODULE_V1)

diff --git a/shared-data/js/fixtures.ts b/shared-data/js/fixtures.ts
@@ -304,16 +304,16 @@ export function getFixtureDisplayName(
       return usbPortNumber != null
         ? `${getModuleDisplayName(
             FLEX_STACKER_MODULE_V1
-          )} in USB-${usbPortNumber} with waste chute with cover`
+          )} in USB-${usbPortNumber} and waste chute with cover`
         : `${getModuleDisplayName(
             FLEX_STACKER_MODULE_V1
-          )} with waste chute with cover`
+          )} and waste chute with cover`
     case FLEX_STACKER_WTIH_WASTE_CHUTE_ADAPTER_NO_COVER_FIXTURE:
       return usbPortNumber != null
         ? `${getModuleDisplayName(
             FLEX_STACKER_MODULE_V1
-          )} in USB-${usbPortNumber} with waste chute`
-        : `${getModuleDisplayName(FLEX_STACKER_MODULE_V1)} with waste chute`
+          )} in USB-${usbPortNumber} and waste chute`
+        : `${getModuleDisplayName(FLEX_STACKER_MODULE_V1)} and waste chute`
     default:
       return 'Slot'
   }