Skip to content

Commit 402b2df

Browse files
committed
fix(protocol-designer): fix labware tools filtering and expand/collapse behavior
This PR addresses several functional issues with our LabwareTools component, produced when adding labware to the starting deck state. Here, I add filtering to populated expanded categories, allow independent expand/collapse toggling for multiple categories simultaneously, and auto expand/collapse all categories based on the state of the current search term. Closes RQA-3590
1 parent 44a80fb commit 402b2df

File tree

3 files changed

+179
-149
lines changed

3 files changed

+179
-149
lines changed

components/src/atoms/ListButton/ListButtonChildren/ListButtonAccordionContainer.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export function ListButtonAccordionContainer(
1616
const { id, children } = props
1717

1818
return (
19-
<Flex key={id} flexDirection={DIRECTION_COLUMN}>
19+
<Flex key={id} flexDirection={DIRECTION_COLUMN} width="100%">
2020
{children}
2121
</Flex>
2222
)

protocol-designer/src/assets/localization/en/starting_deck_state.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"adapter_compatible_lab": "Adapter compatible labware",
3-
"adapter": "Adapter",
3+
"adapter": "Adapters",
44
"add_fixture": "Add a fixture",
55
"add_hardware_labware": "Add hardware/labware",
66
"add_hw_lw": "Add hardware/labware",
@@ -9,7 +9,7 @@
99
"add_module": "Add a module",
1010
"add_rest": "Add labware and liquids to complete deck setup",
1111
"alter_pause": "You may also need to alter the time you pause while your magnet is engaged.",
12-
"aluminumBlock": "Aluminum block",
12+
"aluminumBlock": "Aluminum blocks",
1313
"clear_labware": "Clear labware",
1414
"clear_slot": "Clear slot",
1515
"clear": "Clear",
@@ -47,16 +47,16 @@
4747
"protocol_starting_deck": "Protocol starting deck",
4848
"read_more_gen1_gen2": "Read more about the differences between GEN1 and GEN2 Magnetic Modules",
4949
"rename_lab": "Rename labware",
50-
"reservoir": "Reservoir",
50+
"reservoir": "Reservoirs",
5151
"shift_click_to_select_all": "Shift + Click to select all",
5252
"starting_deck_state": "Starting deck state",
5353
"tc_slots_occupied_flex": "The Thermocycler needs slots A1 and B1. Slot A1 is occupied",
5454
"tc_slots_occupied_ot2": "The Thermocycler needs slots 7, 8, 10, and 11. One or more of those slots is occupied",
55-
"tipRack": "Tip rack",
55+
"tipRack": "Tip racks",
5656
"trash_required": "A trash bin or waste chute is required",
57-
"tubeRack": "Tube rack",
57+
"tubeRack": "Tube racks",
5858
"untitled_protocol": "Untitled protocol",
5959
"upload_custom_labware": "Upload custom labware",
6060
"we_added_hardware": "We've added your deck hardware!",
61-
"wellPlate": "Well plate"
61+
"wellPlate": "Well plates"
6262
}

0 commit comments

Comments
 (0)