feature(app, components, shared-data): Allow add fixture Modal to choose and place AA #18492

TamarZanzouri · 2025-06-02T20:12:30Z

Overview

closes https://opentrons.atlassian.net/browse/EXEC-1241 and https://opentrons.atlassian.net/browse/EXEC-1414.
Allow add fixture modal to show only AA items to place on the deck.

** known issue - when removing a combo fixture it removes both aa. will fix in a follow up.

Selecting a AA will find the fixture match to update deck configuration.

Test Plan and Hands on Testing

make sure you are able to add a waste chute in slot D3 only. (and slot D4 stays empty)
make sure you are able to add a waste chute in slot D3 only and then a staging area in D4
make sure you are able to add a staging area in D4 and then a waste chute in slot D3 only.
make sure you are able to add a staging area in D4 and D3 stays empty.
make sure you are able to add a staging area in D4 and then a mag block D3 only.
smoke test columns 1+2.
smoke test OT2

Changelog

AddFixtureModal component now uses ListItem instead of a Flex component
use ListTable instead of Flex
pass selected aa everywhere related to updating deck config
calculate fixture to update based on aa, cutout and fixture.
refactor logic to use deck def instead of static logic

Review requests

changes make sense? I know its complicated. is there a way I can simplify it? am I missing tets?

Risk assessment

High. need to smoke test PD, Flex app and OT-2

…ray if no match

codecov · 2025-06-02T20:17:38Z

Codecov Report

Attention: Patch coverage is 31.38833% with 341 lines in your changes missing coverage. Please review.

Project coverage is 25.96%. Comparing base (920312e) to head (e203f3c).
Report is 217 commits behind head on edge.

Files with missing lines	Patch %	Lines
.../organisms/DeviceDetailsDeckConfiguration/utils.ts	0.00%	230 Missing ⚠️
...DeviceDetailsDeckConfiguration/AddFixtureModal.tsx	0.00%	41 Missing ⚠️
shared-data/js/fixtures.ts	77.40%	40 Missing ⚠️
...uration/hooks/useDeckConfigurationEditingTools.tsx	0.00%	11 Missing ⚠️
app/src/pages/ODD/ProtocolSetup/index.tsx	0.00%	6 Missing ⚠️
...ocolSetup/ProtocolSetupDeckConfiguration/index.tsx	0.00%	5 Missing ⚠️
.../hardware-sim/DeckConfigurator/EmptyConfigItem.tsx	0.00%	4 Missing ⚠️
...onents/src/hardware-sim/DeckConfigurator/index.tsx	0.00%	3 Missing ⚠️
...etupModulesAndDeck/ProtocolSetupModulesAndDeck.tsx	0.00%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff             @@
##             edge   #18492      +/-   ##
==========================================
- Coverage   26.45%   25.96%   -0.49%     
==========================================
  Files        3266     3285      +19     
  Lines      278189   283917    +5728     
  Branches    32242    34656    +2414     
==========================================
+ Hits        73586    73712     +126     
- Misses     204574   210180    +5606     
+ Partials       29       25       -4

Flag	Coverage Δ
app	`3.07% <15.09%> (+<0.01%)`	⬆️
components	`4.65% <16.29%> (+0.09%)`	⬆️
labware-library	`3.96% <15.09%> (-0.01%)`	⬇️
protocol-designer	`19.10% <16.70%> (-0.33%)`	⬇️
shared-data	`2.54% <29.77%> (+0.16%)`	⬆️
step-generation	`4.88% <15.09%> (+0.21%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files with missing lines	Coverage Δ
components/src/organisms/FixtureOption/index.tsx	`100.00% <100.00%> (+15.90%)`	⬆️
shared-data/js/constants.ts	`100.00% <100.00%> (ø)`
...etupModulesAndDeck/ProtocolSetupModulesAndDeck.tsx	`0.00% <0.00%> (ø)`
...onents/src/hardware-sim/DeckConfigurator/index.tsx	`0.79% <0.00%> (+<0.01%)`	⬆️
.../hardware-sim/DeckConfigurator/EmptyConfigItem.tsx	`32.81% <0.00%> (ø)`
...ocolSetup/ProtocolSetupDeckConfiguration/index.tsx	`0.00% <0.00%> (ø)`
app/src/pages/ODD/ProtocolSetup/index.tsx	`0.00% <0.00%> (ø)`
...uration/hooks/useDeckConfigurationEditingTools.tsx	`0.00% <0.00%> (ø)`
shared-data/js/fixtures.ts	`71.86% <77.40%> (+11.82%)`	⬆️
...DeviceDetailsDeckConfiguration/AddFixtureModal.tsx	`0.00% <0.00%> (ø)`
... and 1 more

... and 452 files with indirect coverage changes

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

sfoster1

let's fix that known issue before merging IMO

app/src/assets/localization/en/deck_configuration.json

sfoster1 · 2025-06-12T20:43:17Z

app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

+    cutoutId: CutoutId,
+    unconfiguredMods: AttachedModule[]
+  ): CutoutConfigMap[][] => {
+    let availableOptions: CutoutConfigMap[][] = []


can we refactor this to split it up and avoid the let-binding?

app/src/organisms/DeviceDetailsDeckConfiguration/__tests__/AddFixtureModal.test.tsx

components/src/organisms/FixtureOption/index.tsx

sfoster1

let's fix lint and ci, that might cut down on the diff some; we should also remove changes that were now-unnecessary experiments to fix circular dependencies and so on.

I think there might need to be more testing on addfixturemodal; the test file diff looks a little light for how much changed in the component.

also it kind of seems like that addressable area useState in ODD protocol setup doesn't really do anything? nothing seems to set it. and that seems like it means that conflict modal wouldn't ever pop up on the ODD.

components/src/organisms/FixtureOption/index.tsx

components/src/atoms/ListItem/index.tsx

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/FixtureTable.tsx

sfoster1

Nice! Let's get a couple more tests in for the more complicated iterative logic both in the modal component and in s-d fixtures, and then I think we're done here.

Also, please write up the stuff you're doing with the fake replacement fixtures in the PR description - flesh out the "how" a little more. Then we'll make sure that makes it into the commit description.

sfoster1 · 2025-06-13T16:59:54Z

components/src/organisms/FixtureOption/index.tsx

-      flexDirection={DIRECTION_ROW}
+    <ListItem
+      type="default"
+      padding="16px"


let's use constants for this instead of literal sizes if possible. also please double check the dqa for the visuals both on odd and desktop

app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

shared-data/js/fixtures.ts

…etUnconfiguredMods

sfoster1

Okay, given the time pressure I think this is solid enough to merge once tests and lint pass. If we have the time, I'd love to see the inner functions i put notes on in AddFixtureModal move to the utils file next to it and their corresponding tests move to utils.test.ts, since some of those inner functions' companions have already done so, but we can also do that in a followup if we need to get it merged right right now.

sfoster1 · 2025-06-17T13:22:45Z

app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

    }),
    onClose: closeModal,
    closeOnOutsideClick: true,
    childrenPadding: SPACING.spacing24,
    width: '26.75rem',
  }

-  let availableOptions: CutoutConfig[][] = []
+  const getUnconfiguredMods = (


this could move to utils

sfoster1 · 2025-06-17T13:22:53Z

app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

+    return availableOptions
+  }
+
+  const getModuleOptions = (


this could move to utils

app/src/organisms/DeviceDetailsDeckConfiguration/AddFixtureModal.tsx

jerader · 2025-06-17T15:46:41Z

components/src/organisms/FixtureOption/index.tsx

-      flexDirection={DIRECTION_ROW}
+  const { onClickHandler, optionName, buttonText } = props
+  return (
+    <ListItem


glad you were able to use this DS component 🚀

jerader

lgtm! smoke tested PD and it looks good - i did notice a small bug though when adding the thermocycler but its all good, we can fix later on since this is merging into edge 😄 nice work!

TamarZanzouri added 9 commits May 29, 2025 14:04

removed changes from selectors test

0390c99

use listItem instead of styling div

db9abd0

refactor add options logic into a function

6121ae5

seperate getOptions to if return

5425352

changed signature providedFixtureOptions optional and return empty ar…

17a62ee

…ray if no match

getModuleFixtures simplify logic

92fa349

WIP get thermo logic from deck def - so close!

7e3a25b

fixed return value for get thermo options

d36122e

refactor by module options from deck def

6a18fd1

TamarZanzouri added 20 commits June 3, 2025 12:41

added combo fixtures to flex stacker WIP

593da7a

fix return value for stacker! working!

e744818

show all flex options

a35a7a9

refactor

a4c14c8

added aa to props and show aa name in title

7059a65

title text fix and progress with console error for combo fix

02d7032

AddressableAreaWithFakes and get mapping for aa

6a885ef

getFixtureOptions with aa

de7d63e

change to aaId instead of object and linting fixes

f391327

providedFixtureOptions with aa

5c10418

waste chute with aa and refactor WIP

ea5d787

WIP refactor thermo

5641e72

change logic to only fetch via mapper when in column 1 and 2

61c0515

fixed bug related to empty entery when no aa is found

da0d1bd

fixed bug with waste chute

91f5e02

dont show combo fixtures

1e9e368

add fixture logic for combo fixtures wip

b0472ff

skeleton for mapping to combo

3ba0299

get all optional fixtures

86ad6b8

add sn to cutout config for combo fixtures

7d40fb4

TamarZanzouri requested review from a team as code owners June 12, 2025 19:44

TamarZanzouri requested review from ncdiehl11, sfoster1 and smb2268 and removed request for a team and ncdiehl11 June 12, 2025 19:44

TamarZanzouri added 2 commits June 12, 2025 16:11

docstrings

791f6fa

removed console log

3d310cb

TamarZanzouri requested a review from mjhuff June 12, 2025 20:14

sfoster1 requested changes Jun 12, 2025

View reviewed changes

pr feedback

8788f46

sfoster1 requested changes Jun 13, 2025

View reviewed changes

components/src/organisms/FixtureOption/index.tsx Outdated Show resolved Hide resolved

components/src/atoms/ListItem/index.tsx Outdated Show resolved Hide resolved

app/src/organisms/ODD/ProtocolSetup/ProtocolSetupModulesAndDeck/FixtureTable.tsx Outdated Show resolved Hide resolved

TamarZanzouri added 5 commits June 13, 2025 12:14

removed unused setAddressableAreaId revert css changes and linting

79b2262

revert get fixture display name

b9d676f

varios small fixes

315df66

test fix

619e3e1

test fix

f9edf26

TamarZanzouri requested a review from sfoster1 June 16, 2025 01:20

sfoster1 requested changes Jun 16, 2025

View reviewed changes

TamarZanzouri added 4 commits June 16, 2025 13:16

added tests for getFlexDeckDefAAByFixtureIdForCutoutId and refactor g…

43b91cc

…etUnconfiguredMods

refactor getThermoUnconfiguredFixtures and getModuleUnconfiguredFixtures

bf6daaf

fix naming fake slots

8b48f84

refactor and test

8015aa8

sfoster1 approved these changes Jun 17, 2025

View reviewed changes

moved utils logic into utils

e203f3c

jerader reviewed Jun 17, 2025

View reviewed changes

jerader approved these changes Jun 17, 2025

View reviewed changes

TamarZanzouri merged commit ada6450 into edge Jun 17, 2025
55 checks passed

TamarZanzouri deleted the EXEC-1241-component-update-add-fixture-modal-fixture-option-to-use-list-item-component branch June 17, 2025 16:09

feature(app, components, shared-data): Allow add fixture Modal to choose and place AA #18492

feature(app, components, shared-data): Allow add fixture Modal to choose and place AA #18492

Uh oh!

Conversation

TamarZanzouri commented Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Overview

Test Plan and Hands on Testing

Changelog

Review requests

Risk assessment

Uh oh!

codecov bot commented Jun 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sfoster1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

sfoster1 Jun 12, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sfoster1 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sfoster1 left a comment

Choose a reason for hiding this comment

Uh oh!

sfoster1 Jun 13, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

sfoster1 left a comment

Choose a reason for hiding this comment

Uh oh!

sfoster1 Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

sfoster1 Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jerader Jun 17, 2025

Choose a reason for hiding this comment

Uh oh!

jerader left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

TamarZanzouri commented Jun 2, 2025 •

edited

Loading

codecov bot commented Jun 2, 2025 •

edited

Loading