fix(protocol-designer): allow custom labware on adapters (#17217)

jerader · web-flow · commit 9bced85d6c31 · 2025-01-08T12:50:24.000-05:00
closes RQA-3779
diff --git a/protocol-designer/src/pages/Designer/DeckSetup/LabwareTools.tsx b/protocol-designer/src/pages/Designer/DeckSetup/LabwareTools.tsx
@@ -430,10 +430,15 @@ export function LabwareTools(props: LabwareToolsProps): JSX.Element {
                                             )
                                           }
                                         )
-                                      : getLabwareCompatibleWithAdapter(
-                                          loadName
-                                        ).map(nestedDefUri => {
-                                          const nestedDef = defs[nestedDefUri]
+                                      : [
+                                          ...getLabwareCompatibleWithAdapter(
+                                            loadName
+                                          ),
+                                          ...Object.keys(customLabwareDefs),
+                                        ].map(nestedDefUri => {
+                                          const nestedDef =
+                                            defs[nestedDefUri] ??
+                                            customLabwareDefs[nestedDefUri]
 
                                           return (
                                             <ListButtonRadioButton

Original file line number	Diff line number	Diff line change
`@@ -430,10 +430,15 @@ export function LabwareTools(props: LabwareToolsProps): JSX.Element {`
`430`	`430`	`)`
`431`	`431`	`}`
`432`	`432`	`)`
`433`		`- : getLabwareCompatibleWithAdapter(`
`434`		`- loadName`
`435`		`- ).map(nestedDefUri => {`
`436`		`- const nestedDef = defs[nestedDefUri]`
	`433`	`+ : [`
	`434`	`+ ...getLabwareCompatibleWithAdapter(`
	`435`	`+ loadName`
	`436`	`+ ),`
	`437`	`+ ...Object.keys(customLabwareDefs),`
	`438`	`+ ].map(nestedDefUri => {`
	`439`	`+ const nestedDef =`
	`440`	`+ defs[nestedDefUri] ??`
	`441`	`+ customLabwareDefs[nestedDefUri]`
`437`	`442`
`438`	`443`	`return (`
`439`	`444`	`<ListButtonRadioButton`