@opentrons/components 0.1.7-alpha.0 → 0.2.0-alpha.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +0 -1
- package/cssModuleSideEffect.ts +22 -0
- package/lib/assets/localization/en/index.d.ts +26 -0
- package/lib/assets/localization/index.d.ts +26 -0
- package/lib/atoms/AnimationVideo/index.d.ts +13 -0
- package/lib/atoms/Chip/index.d.ts +2 -0
- package/lib/atoms/InlineNotification/index.d.ts +18 -0
- package/lib/atoms/ListButton/ListButtonChildren/index.d.ts +0 -1
- package/lib/atoms/ListButton/index.d.ts +5 -0
- package/lib/atoms/ListItem/ListItemChildren/ListItemDescriptor.d.ts +4 -0
- package/lib/atoms/StyledText/PlaceholderStyledText.d.ts +14 -0
- package/lib/atoms/StyledText/StyledText.d.ts +1 -1
- package/lib/atoms/StyledText/index.d.ts +1 -0
- package/lib/atoms/Tag/index.d.ts +4 -1
- package/lib/atoms/Toast/index.d.ts +1 -1
- package/lib/atoms/Tooltip/index.d.ts +1 -1
- package/lib/atoms/buttons/BasicButton.d.ts +12 -0
- package/lib/atoms/buttons/LargeButton.d.ts +1 -1
- package/lib/atoms/buttons/RadioButton.d.ts +29 -1
- package/lib/atoms/buttons/index.d.ts +1 -0
- package/lib/atoms/index.d.ts +4 -2
- package/lib/buttons/Button.d.ts +1 -1
- package/lib/controls/ToggleButton.d.ts +8 -2
- package/lib/controls/index.d.ts +0 -1
- package/lib/forms/DeprecatedCheckboxField.d.ts +1 -1
- package/lib/forms/SelectField.d.ts +1 -1
- package/lib/hardware-sim/BaseDeck/BaseDeck.d.ts +19 -5
- package/lib/hardware-sim/BaseDeck/WasteChuteFixture.d.ts +1 -1
- package/lib/hardware-sim/Deck/FlexTrash.d.ts +4 -1
- package/lib/hardware-sim/Deck/MoveLabwareOnDeck.d.ts +3 -2
- package/lib/hardware-sim/Deck/RobotCoordsForeignDiv.d.ts +6 -5
- package/lib/hardware-sim/Deck/RobotCoordsForeignObject.d.ts +8 -5
- package/lib/hardware-sim/Deck/RobotCoordsText.d.ts +11 -1
- package/lib/hardware-sim/Deck/RobotWorkSpace.d.ts +30 -14
- package/lib/hardware-sim/Deck/__tests__/resolveLabwareLocation.test.d.ts +1 -0
- package/lib/hardware-sim/Deck/resolveLabwareLocation.d.ts +20 -0
- package/lib/hardware-sim/DeckConfigurator/AbsorbanceReaderItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/EmptyConfigItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/FlexStackerItem.d.ts +12 -0
- package/lib/hardware-sim/DeckConfigurator/HeaterShakerItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/MagneticBlockItem.d.ts +12 -0
- package/lib/hardware-sim/DeckConfigurator/StagingAreaConfigItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/{StaticFixture.d.ts → StaticItem.d.ts} +1 -1
- package/lib/hardware-sim/DeckConfigurator/TemperatureModuleItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/ThermocyclerItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/TrashBinConfigItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/WasteChuteConfigItem.d.ts +11 -0
- package/lib/hardware-sim/DeckConfigurator/constants.d.ts +5 -8
- package/lib/hardware-sim/DeckConfigurator/index.d.ts +4 -3
- package/lib/hardware-sim/Labware/CalibrationBlockRender.d.ts +15 -0
- package/lib/hardware-sim/Labware/Labware.d.ts +8 -9
- package/lib/hardware-sim/Labware/LabwareAdapter/index.d.ts +4 -4
- package/lib/hardware-sim/Labware/LabwareRender.d.ts +47 -6
- package/lib/hardware-sim/Labware/index.d.ts +1 -1
- package/lib/hardware-sim/Labware/labwareInternals/FilledWells.d.ts +3 -4
- package/lib/hardware-sim/Labware/labwareInternals/LabwareOutline.d.ts +20 -9
- package/lib/hardware-sim/Labware/labwareInternals/LabwareWellLabels.d.ts +2 -2
- package/lib/hardware-sim/Labware/labwareInternals/StaticLabware.d.ts +3 -3
- package/lib/hardware-sim/Labware/labwareInternals/StrokedWells.d.ts +3 -3
- package/lib/hardware-sim/Labware/labwareInternals/StyledWells.d.ts +2 -2
- package/lib/hardware-sim/Labware/labwareInternals/Well.d.ts +1 -2
- package/lib/hardware-sim/Labware/labwareInternals/WellLabels.d.ts +2 -2
- package/lib/hardware-sim/Labware/labwareInternals/getTiprackBackgroundColor.d.ts +1 -0
- package/lib/hardware-sim/Module/FlexStacker.d.ts +1 -0
- package/lib/hardware-sim/Module/index.d.ts +25 -3
- package/lib/hardware-sim/Pipette/PipetteRender.d.ts +2 -2
- package/lib/hardware-sim/RobotCoordinateSpace/RobotCoordinateSpace.d.ts +5 -3
- package/lib/hardware-sim/index.d.ts +0 -2
- package/lib/helix-design-system/colors.d.ts +2 -1
- package/lib/hocs/withStyleProps.d.ts +26 -0
- package/lib/hooks/useConditionalConfirm.d.ts +4 -0
- package/lib/hooks/useSwipe.d.ts +1 -1
- package/lib/icons/Icon.d.ts +7 -7
- package/lib/icons/ModuleIcon.d.ts +5 -4
- package/lib/icons/NotificationIcon.d.ts +1 -1
- package/lib/instrument/InstrumentDiagram.d.ts +1 -1
- package/lib/instrument/index.d.ts +0 -3
- package/lib/legacy-hardware-sim/index.d.ts +0 -1
- package/lib/lists/index.d.ts +0 -1
- package/lib/molecules/Banner/index.d.ts +1 -1
- package/lib/molecules/CustomizeExpandButton/__tests__/CustomizeExpandButton.test.d.ts +1 -0
- package/lib/molecules/CustomizeExpandButton/index.d.ts +29 -0
- package/lib/molecules/DeckInfoLabel/index.d.ts +8 -16
- package/lib/molecules/DropdownMenu/index.d.ts +1 -1
- package/lib/molecules/LiquidIcon/index.d.ts +2 -2
- package/lib/molecules/index.d.ts +2 -1
- package/lib/organisms/CommandText/index.d.ts +2 -2
- package/lib/organisms/CommandText/useCommandTextString/index.d.ts +3 -3
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/__tests__/getFlexStackerCommandText.test.d.ts +1 -0
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/__tests__/getRobotCommandText.test.d.ts +1 -0
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/getAbsorbanceReaderCommandText.d.ts +1 -1
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/getFlexStackerCommandText.d.ts +6 -3
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/getRobotCommandText.d.ts +4 -0
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/getTemperatureCommandText.d.ts +1 -1
- package/lib/organisms/CommandText/useCommandTextString/utils/commandText/index.d.ts +2 -0
- package/lib/organisms/CommandText/useCommandTextString/utils/getAddressableAreaDisplayName.d.ts +1 -1
- package/lib/organisms/CommandText/useCommandTextString/utils/getFinalLabwareLocation.d.ts +1 -1
- package/lib/organisms/CommandText/useCommandTextString/utils/getLabwareDefinitionsFromCommands.d.ts +2 -2
- package/lib/organisms/CommandText/useCommandTextString/utils/getLabwareDisplayLocation.d.ts +1 -1
- package/lib/organisms/CommandText/useCommandTextString/utils/getLabwareLocation.d.ts +3 -3
- package/lib/organisms/CommandText/useCommandTextString/utils/getLabwareName.d.ts +2 -2
- package/lib/organisms/DeckLabelSet/index.d.ts +1 -0
- package/lib/organisms/FixtureOption/__tests__/FixtureOption.test.d.ts +1 -0
- package/lib/organisms/FixtureOption/index.d.ts +10 -0
- package/lib/{hardware-sim → organisms}/ProtocolDeck/index.d.ts +2 -3
- package/lib/organisms/ProtocolTimelineScrubber/CommandItem.d.ts +2 -2
- package/lib/organisms/ProtocolTimelineScrubber/utils.d.ts +3 -3
- package/lib/organisms/index.d.ts +2 -0
- package/lib/primitives/ForeignObject.d.ts +8 -18
- package/lib/primitives/Link.d.ts +1 -1
- package/lib/primitives/Svg.d.ts +1 -1
- package/lib/primitives/style-props.d.ts +2 -2
- package/lib/primitives/types.d.ts +1 -1
- package/lib/structure/index.d.ts +2 -3
- package/lib/testing/utils/renderWithProviders.d.ts +2 -2
- package/lib/tooltips/LegacyTooltip.d.ts +1 -1
- package/lib/tooltips/types.d.ts +2 -2
- package/package.json +6 -4
- package/src/Components.mdx +12 -0
- package/src/__tests__/utils.test.ts +2 -1
- package/src/alerts/AlertItem.stories.tsx +2 -2
- package/src/alerts/AlertItem.tsx +2 -1
- package/src/alerts/alerts.module.css +2 -2
- package/src/assets/localization/en/deck_configuration.json +12 -0
- package/src/assets/localization/en/index.ts +2 -0
- package/src/assets/localization/en/protocol_command_text.json +15 -1
- package/src/atoms/AnimationVideo/__tests__/AnimationVideo.test.tsx +40 -0
- package/src/atoms/AnimationVideo/index.tsx +44 -0
- package/src/atoms/Checkbox/Checkbox.stories.tsx +1 -1
- package/src/atoms/Checkbox/__tests__/Checkbox.test.tsx +4 -2
- package/src/atoms/Checkbox/index.tsx +3 -2
- package/src/atoms/CheckboxField/CheckboxField.stories.tsx +3 -2
- package/src/atoms/CheckboxField/__tests__/CheckboxField.test.tsx +21 -38
- package/src/atoms/CheckboxField/index.tsx +81 -70
- package/src/atoms/Chip/Chip.stories.tsx +3 -2
- package/src/atoms/Chip/__tests__/Chip.test.tsx +41 -3
- package/src/atoms/Chip/index.tsx +76 -50
- package/src/atoms/InlineNotification/InlineNotification.stories.tsx +107 -0
- package/src/atoms/InlineNotification/__tests__/InlineNotification.test.tsx +66 -0
- package/src/atoms/InlineNotification/index.tsx +213 -0
- package/src/atoms/InputField/InputField.stories.tsx +3 -0
- package/src/atoms/InputField/__tests__/InputField.test.tsx +4 -3
- package/src/atoms/InputField/index.tsx +4 -4
- package/src/atoms/ListButton/ListButton.stories.tsx +24 -8
- package/src/atoms/ListButton/ListButtonChildren/index.ts +0 -1
- package/src/atoms/ListButton/__tests__/ListButton.test.tsx +5 -3
- package/src/atoms/ListButton/__tests__/ListButtonAccordion.test.tsx +2 -2
- package/src/atoms/ListButton/index.tsx +57 -41
- package/src/atoms/ListItem/ListItem.stories.tsx +7 -5
- package/src/atoms/ListItem/ListItemChildren/ListItemCustomize.tsx +21 -15
- package/src/atoms/ListItem/ListItemChildren/ListItemDescriptor.tsx +6 -2
- package/src/atoms/ListItem/__tests__/ListItem.test.tsx +5 -3
- package/src/atoms/ListItem/index.tsx +3 -2
- package/src/atoms/ListTable/ListTable.stories.tsx +1 -1
- package/src/atoms/ListTable/__tests__/ListTable.test.tsx +2 -2
- package/src/atoms/ListTable/index.tsx +4 -4
- package/src/atoms/MenuList/MenuItem.stories.tsx +1 -1
- package/src/atoms/MenuList/MenuItem.tsx +4 -1
- package/src/atoms/MenuList/MenuList.stories.tsx +1 -0
- package/src/atoms/MenuList/OverflowBtn.tsx +40 -42
- package/src/atoms/MenuList/__tests__/MenuItem.test.tsx +2 -3
- package/src/atoms/MenuList/__tests__/MenuList.test.tsx +2 -2
- package/src/atoms/MenuList/__tests__/OverflowBtn.test.tsx +1 -1
- package/src/atoms/MenuList/index.tsx +2 -2
- package/src/atoms/Snackbar/Snackbar.stories.tsx +60 -22
- package/src/atoms/Snackbar/__tests__/Snackbar.test.tsx +6 -3
- package/src/atoms/Snackbar/index.tsx +51 -40
- package/src/atoms/StepMeter/__tests__/StepMeter.test.tsx +45 -0
- package/src/atoms/StepMeter/index.tsx +33 -24
- package/src/atoms/StyledText/LegacyStyledText.stories.tsx +2 -1
- package/src/atoms/StyledText/LegacyStyledText.tsx +3 -2
- package/src/atoms/StyledText/PlaceholderStyledText.tsx +46 -0
- package/src/atoms/StyledText/StyledText.stories.tsx +3 -2
- package/src/atoms/StyledText/StyledText.tsx +4 -3
- package/src/atoms/StyledText/index.ts +1 -0
- package/src/atoms/StyledText/placeholderstyledtext.module.css +25 -0
- package/src/atoms/SubListTable/SubListTable.stories.tsx +1 -1
- package/src/atoms/SubListTable/__tests__/SubListTable.test.tsx +2 -2
- package/src/atoms/SubListTable/index.tsx +4 -4
- package/src/atoms/Tag/Tag.stories.tsx +2 -1
- package/src/atoms/Tag/__tests__/Tag.test.tsx +2 -1
- package/src/atoms/Tag/index.tsx +53 -35
- package/src/atoms/Toast/ODDToast.stories.tsx +18 -8
- package/src/atoms/Toast/Toast.stories.tsx +3 -2
- package/src/atoms/Toast/__tests__/ODDToast.test.tsx +5 -2
- package/src/atoms/Toast/__tests__/Toast.test.tsx +5 -2
- package/src/atoms/Toast/index.tsx +75 -80
- package/src/atoms/ToggleGroup/ToggleGroup.stories.tsx +2 -0
- package/src/atoms/ToggleGroup/__tests__/ToggleGroup.test.tsx +2 -1
- package/src/atoms/ToggleGroup/index.tsx +2 -1
- package/src/atoms/Tooltip/Tooltip.stories.tsx +6 -5
- package/src/atoms/Tooltip/__tests__/Tooltip.test.tsx +6 -5
- package/src/atoms/Tooltip/index.tsx +3 -3
- package/src/atoms/buttons/AlertPrimaryButton.tsx +2 -1
- package/src/atoms/buttons/AltPrimaryButton.tsx +1 -1
- package/src/atoms/buttons/BasicButton.tsx +100 -0
- package/src/atoms/buttons/EmptySelectorButton.stories.tsx +1 -0
- package/src/atoms/buttons/EmptySelectorButton.tsx +10 -3
- package/src/atoms/buttons/LargeButton.stories.tsx +2 -2
- package/src/atoms/buttons/LargeButton.tsx +5 -5
- package/src/atoms/buttons/PrimaryButton.tsx +7 -3
- package/src/atoms/buttons/RadioButton.stories.tsx +2 -1
- package/src/atoms/buttons/RadioButton.tsx +102 -43
- package/src/atoms/buttons/SecondaryButton.tsx +18 -9
- package/src/atoms/buttons/TertiaryButton.tsx +1 -0
- package/src/atoms/buttons/__tests__/AlertPrimaryButton.test.tsx +5 -4
- package/src/atoms/buttons/__tests__/AltPrimaryButton.test.tsx +6 -4
- package/src/atoms/buttons/__tests__/BasicButton.test.tsx +87 -0
- package/src/atoms/buttons/__tests__/EmptySelectorButton.test.tsx +4 -2
- package/src/atoms/buttons/__tests__/LargeButton.test.tsx +4 -2
- package/src/atoms/buttons/__tests__/PrimaryButton.test.tsx +7 -5
- package/src/atoms/buttons/__tests__/RadioButton.test.tsx +17 -3
- package/src/atoms/buttons/__tests__/SecondaryButton.test.tsx +6 -5
- package/src/atoms/buttons/buttons.stories.tsx +92 -56
- package/src/atoms/buttons/index.ts +1 -0
- package/src/atoms/index.ts +4 -2
- package/src/buttons/Button.tsx +2 -3
- package/src/buttons/IconButton.tsx +1 -2
- package/src/buttons/buttons.module.css +92 -92
- package/src/controls/LabeledRadioGroup.tsx +1 -1
- package/src/controls/ToggleButton.tsx +62 -18
- package/src/controls/index.ts +0 -1
- package/src/controls/styles.module.css +15 -15
- package/src/forms/DeprecatedCheckboxField.stories.tsx +1 -1
- package/src/forms/DeprecatedCheckboxField.tsx +3 -3
- package/src/forms/FormGroup.stories.tsx +3 -4
- package/src/forms/FormGroup.tsx +1 -0
- package/src/forms/InputField.stories.tsx +2 -1
- package/src/forms/LegacyInputField.tsx +1 -0
- package/src/forms/RadioGroup.stories.tsx +2 -1
- package/src/forms/RadioGroup.tsx +1 -0
- package/src/forms/Select.module.css +23 -23
- package/src/forms/Select.stories.tsx +2 -3
- package/src/forms/Select.tsx +3 -3
- package/src/forms/SelectField.tsx +1 -1
- package/src/forms/ToggleField.stories.tsx +1 -1
- package/src/forms/ToggleField.tsx +2 -2
- package/src/forms/forms.module.css +38 -37
- package/src/hardware-sim/BaseDeck/BaseDeck.stories.tsx +8 -8
- package/src/hardware-sim/BaseDeck/BaseDeck.tsx +164 -27
- package/src/hardware-sim/BaseDeck/WasteChuteFixture.tsx +26 -32
- package/src/hardware-sim/BaseDeck/__fixtures__/index.ts +2 -2
- package/src/hardware-sim/BaseDeck/basedeck.module.css +20 -0
- package/src/hardware-sim/Deck/DeckFromLayers.tsx +6 -5
- package/src/hardware-sim/Deck/FlexTrash.tsx +51 -30
- package/src/hardware-sim/Deck/MoveLabwareOnDeck.stories.tsx +6 -5
- package/src/hardware-sim/Deck/MoveLabwareOnDeck.tsx +129 -163
- package/src/hardware-sim/Deck/RobotCoordsForeignDiv.tsx +35 -27
- package/src/hardware-sim/Deck/RobotCoordsForeignObject.tsx +33 -29
- package/src/hardware-sim/Deck/RobotCoordsText.tsx +12 -11
- package/src/hardware-sim/Deck/RobotWorkSpace.tsx +76 -54
- package/src/hardware-sim/Deck/SlotLabels.tsx +53 -51
- package/src/hardware-sim/Deck/__tests__/resolveLabwareLocation.test.ts +138 -0
- package/src/hardware-sim/Deck/deck.module.css +54 -0
- package/src/hardware-sim/Deck/resolveLabwareLocation.ts +154 -0
- package/src/hardware-sim/DeckConfigurator/{FlexStackerFixture.tsx → AbsorbanceReaderItem.tsx} +36 -33
- package/src/hardware-sim/DeckConfigurator/DeckConfigurator.stories.tsx +2 -3
- package/src/hardware-sim/DeckConfigurator/{EmptyConfigFixture.tsx → EmptyConfigItem.tsx} +73 -44
- package/src/hardware-sim/DeckConfigurator/{AbsorbanceReaderFixture.tsx → FlexStackerItem.tsx} +48 -29
- package/src/hardware-sim/DeckConfigurator/{HeaterShakerFixture.tsx → HeaterShakerItem.tsx} +42 -30
- package/src/hardware-sim/DeckConfigurator/{MagneticBlockFixture.tsx → MagneticBlockItem.tsx} +44 -61
- package/src/hardware-sim/DeckConfigurator/{StagingAreaConfigFixture.tsx → StagingAreaConfigItem.tsx} +42 -24
- package/src/hardware-sim/DeckConfigurator/{StaticFixture.tsx → StaticItem.tsx} +16 -9
- package/src/hardware-sim/DeckConfigurator/{TemperatureModuleFixture.tsx → TemperatureModuleItem.tsx} +44 -28
- package/src/hardware-sim/DeckConfigurator/{ThermocyclerFixture.tsx → ThermocyclerItem.tsx} +34 -24
- package/src/hardware-sim/DeckConfigurator/{TrashBinConfigFixture.tsx → TrashBinConfigItem.tsx} +44 -29
- package/src/hardware-sim/DeckConfigurator/{WasteChuteConfigFixture.tsx → WasteChuteConfigItem.tsx} +40 -29
- package/src/hardware-sim/DeckConfigurator/constants.ts +5 -9
- package/src/hardware-sim/DeckConfigurator/index.tsx +240 -197
- package/src/hardware-sim/Labware/CalibrationBlockRender.stories.tsx +49 -0
- package/src/hardware-sim/Labware/CalibrationBlockRender.tsx +172 -0
- package/src/hardware-sim/Labware/Labware.tsx +35 -22
- package/src/hardware-sim/Labware/LabwareAdapter/index.tsx +7 -6
- package/src/hardware-sim/Labware/LabwareRender.stories.tsx +40 -26
- package/src/hardware-sim/Labware/LabwareRender.tsx +77 -23
- package/src/hardware-sim/Labware/__tests__/Labware.test.tsx +15 -6
- package/src/hardware-sim/Labware/__tests__/LabwareRender.test.tsx +20 -7
- package/src/hardware-sim/Labware/index.ts +1 -1
- package/src/hardware-sim/Labware/labware.module.css +8 -0
- package/src/hardware-sim/Labware/labwareInternals/FilledWells.tsx +4 -4
- package/src/hardware-sim/Labware/labwareInternals/LabwareOutline.tsx +54 -24
- package/src/hardware-sim/Labware/labwareInternals/LabwareWellLabels.tsx +5 -4
- package/src/hardware-sim/Labware/labwareInternals/StaticLabware.tsx +7 -7
- package/src/hardware-sim/Labware/labwareInternals/StrokedWells.tsx +5 -4
- package/src/hardware-sim/Labware/labwareInternals/StyledWells.tsx +4 -3
- package/src/hardware-sim/Labware/labwareInternals/Well.tsx +5 -3
- package/src/hardware-sim/Labware/labwareInternals/WellLabels.tsx +12 -12
- package/src/hardware-sim/Labware/labwareInternals/__tests__/LabwareWellLabels.test.tsx +6 -3
- package/src/hardware-sim/Labware/labwareInternals/__tests__/StrokedWells.test.tsx +7 -3
- package/src/hardware-sim/Labware/labwareInternals/__tests__/WellLabels.test.tsx +8 -4
- package/src/hardware-sim/Labware/labwareInternals/getTiprackBackgroundColor.ts +32 -0
- package/src/hardware-sim/Module/FlexStacker.tsx +54 -0
- package/src/hardware-sim/Module/Module.stories.tsx +49 -18
- package/src/hardware-sim/Module/ModuleTag.tsx +3 -3
- package/src/hardware-sim/Module/Thermocycler/ThermocyclerGEN1.tsx +1 -0
- package/src/hardware-sim/Module/Thermocycler/index.tsx +4 -4
- package/src/hardware-sim/Module/index.tsx +55 -25
- package/src/hardware-sim/Pipette/EightEmanatingNozzles.tsx +1 -0
- package/src/hardware-sim/Pipette/EmanatingNozzle.tsx +2 -1
- package/src/hardware-sim/Pipette/PipetteRender.stories.tsx +6 -4
- package/src/hardware-sim/Pipette/PipetteRender.tsx +12 -12
- package/src/hardware-sim/Pipette/__tests__/EightEmanatingNozzles.test.tsx +2 -1
- package/src/hardware-sim/Pipette/__tests__/EmanatingNozzle.test.tsx +4 -3
- package/src/hardware-sim/Pipette/__tests__/PipetteRender.test.tsx +11 -9
- package/src/hardware-sim/RobotCoordinateSpace/RobotCoordinateSpace.tsx +16 -14
- package/src/hardware-sim/RobotCoordinateSpace/RobotCoordinateSpaceWithRef.tsx +1 -0
- package/src/hardware-sim/RobotCoordinateSpace/robotcoordinatespace.module.css +3 -0
- package/src/hardware-sim/index.ts +0 -2
- package/src/helix-design-system/colors.ts +2 -1
- package/src/hocs/withStyleProps.ts +53 -0
- package/src/hooks/__tests__/useDrag.test.ts +3 -1
- package/src/hooks/__tests__/useLongPress.test.ts +2 -1
- package/src/hooks/__tests__/useScrolling.test.tsx +3 -2
- package/src/hooks/__tests__/useSwipe.test.tsx +2 -1
- package/src/hooks/useConditionalConfirm.ts +15 -5
- package/src/hooks/useDrag.ts +2 -1
- package/src/hooks/useInterval.ts +1 -0
- package/src/hooks/useLongPress.ts +2 -1
- package/src/hooks/useMenuHandleClickOutside.tsx +1 -0
- package/src/hooks/useMountEffect.ts +2 -0
- package/src/hooks/useScrolling.ts +1 -1
- package/src/hooks/useSelectDeckLocation/SelectDeckLocation.stories.tsx +3 -1
- package/src/hooks/useSelectDeckLocation/index.tsx +8 -6
- package/src/hooks/useSwipe.ts +3 -2
- package/src/i18n.ts +4 -2
- package/src/icons/Icon.stories.tsx +2 -1
- package/src/icons/Icon.tsx +38 -29
- package/src/icons/IconList.stories.tsx +9 -8
- package/src/icons/ModuleIcon.tsx +13 -10
- package/src/icons/NotificationIcon.tsx +1 -1
- package/src/icons/icon-data.ts +29 -0
- package/src/icons/icon.module.css +10 -0
- package/src/index.module.css +1 -0
- package/src/instrument/InstrumentDiagram.tsx +9 -10
- package/src/instrument/PipetteSelect.module.css +3 -3
- package/src/instrument/index.ts +0 -3
- package/src/interaction-enhancers/ClickOutside.ts +1 -0
- package/src/interaction-enhancers/HandleKeypress.tsx +1 -0
- package/src/interaction-enhancers/__tests__/useHover.test.tsx +1 -0
- package/src/interaction-enhancers/useHover.ts +1 -1
- package/src/legacy-hardware-sim/LabwareNameOverlay.module.css +5 -5
- package/src/legacy-hardware-sim/LabwareNameOverlay.tsx +1 -0
- package/src/legacy-hardware-sim/ModuleItem.module.css +19 -19
- package/src/legacy-hardware-sim/index.ts +0 -1
- package/src/lists/SidePanelGroup.tsx +1 -1
- package/src/lists/index.ts +0 -1
- package/src/lists/lists.module.css +23 -23
- package/src/modals/LegacyModal.tsx +2 -2
- package/src/modals/Modal.stories.tsx +1 -1
- package/src/modals/Modal.tsx +1 -1
- package/src/modals/ModalHeader.tsx +2 -2
- package/src/modals/ModalShell.tsx +3 -2
- package/src/modals/SpinnerModal.tsx +2 -2
- package/src/modals/SpinnerModalPage.tsx +1 -1
- package/src/modals/__tests__/Modal.test.tsx +4 -2
- package/src/modals/__tests__/ModalHeader.test.tsx +5 -3
- package/src/modals/__tests__/ModalShell.test.tsx +3 -1
- package/src/modals/modals.module.css +55 -55
- package/src/molecules/Banner/Banner.stories.tsx +1 -1
- package/src/molecules/Banner/__tests__/Banner.test.tsx +2 -2
- package/src/molecules/Banner/index.tsx +5 -4
- package/src/molecules/CustomizeExpandButton/__tests__/CustomizeExpandButton.test.tsx +88 -0
- package/src/molecules/CustomizeExpandButton/index.tsx +189 -0
- package/src/molecules/DeckInfoLabel/DeckInfoLabel.stories.tsx +10 -6
- package/src/molecules/DeckInfoLabel/__tests__/DeckInfoLabel.test.tsx +17 -13
- package/src/molecules/DeckInfoLabel/deckinfolabel.module.css +42 -0
- package/src/molecules/DeckInfoLabel/index.tsx +36 -62
- package/src/molecules/DeckLabel/__tests__/DeckLabel.test.tsx +3 -3
- package/src/molecules/DeckLabel/index.tsx +5 -3
- package/src/molecules/DropdownMenu/__tests__/DropdownMenu.test.tsx +3 -3
- package/src/molecules/DropdownMenu/index.tsx +21 -14
- package/src/molecules/InfoScreen/InfoScreen.stories.tsx +2 -1
- package/src/molecules/InfoScreen/__tests__/InfoScreen.test.tsx +3 -3
- package/src/molecules/InfoScreen/index.tsx +7 -3
- package/src/molecules/LiquidIcon/LiquidIcon.stories.tsx +3 -2
- package/src/molecules/LiquidIcon/__tests__/LiquidIcon.test.tsx +4 -4
- package/src/molecules/LiquidIcon/index.tsx +16 -10
- package/src/molecules/ListAccordion/ListAccordion.stories.tsx +3 -3
- package/src/molecules/ListAccordion/__tests__/ListAccordion.test.tsx +3 -3
- package/src/molecules/ListAccordion/index.tsx +6 -6
- package/src/molecules/ParametersTable/ParametersTable.stories.tsx +1 -0
- package/src/molecules/ParametersTable/__tests__/ParametersTable.test.tsx +3 -2
- package/src/molecules/ParametersTable/index.tsx +9 -7
- package/src/molecules/ReleaseNotes/index.tsx +1 -1
- package/src/molecules/ReleaseNotes/styles.module.css +15 -15
- package/src/molecules/Tabs/Tabs.stories.tsx +3 -1
- package/src/molecules/Tabs/__tests__/Tabs.test.tsx +3 -2
- package/src/molecules/Tabs/index.tsx +4 -3
- package/src/molecules/TextListTableContent/TextListTableContent.stories.tsx +1 -1
- package/src/molecules/TextListTableContent/__tests__/TextListTableContent.test.tsx +2 -2
- package/src/molecules/TextListTableContent/index.tsx +2 -2
- package/src/molecules/index.ts +2 -1
- package/src/nav/SidePanel.module.css +6 -6
- package/src/nav/SidePanel.stories.tsx +4 -3
- package/src/organisms/CommandText/CommandText.stories.tsx +3 -2
- package/src/organisms/CommandText/__tests__/CommandText.test.tsx +19 -18
- package/src/organisms/CommandText/fixtures/index.ts +1 -0
- package/src/organisms/CommandText/index.tsx +6 -4
- package/src/organisms/CommandText/useCommandTextString/index.ts +29 -6
- package/src/organisms/CommandText/useCommandTextString/utils/__tests__/formatDuration.test.tsx +2 -1
- package/src/organisms/CommandText/useCommandTextString/utils/__tests__/getFinalLabwareLocation.test.ts +8 -5
- package/src/organisms/CommandText/useCommandTextString/utils/__tests__/getLabwareDisplayLocation.test.tsx +6 -5
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/__tests__/getFlexStackerCommandText.test.tsx +179 -0
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/__tests__/getPipettingCommandText.test.tsx +13 -12
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/__tests__/getRobotCommandText.test.tsx +118 -0
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getAbsorbanceReaderCommandText.ts +1 -1
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getFlexStackerCommandText.ts +140 -6
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getLiquidProbeCommandText.ts +1 -0
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getLoadCommandText.ts +4 -3
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getMoveToWellCommandText.ts +19 -3
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getPipettingCommandText.ts +24 -14
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getRobotCommandText.ts +87 -0
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getTCRunExtendedProfileCommandText.ts +3 -2
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getTCRunProfileCommandText.ts +1 -0
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/getTemperatureCommandText.ts +4 -4
- package/src/organisms/CommandText/useCommandTextString/utils/commandText/index.ts +2 -0
- package/src/organisms/CommandText/useCommandTextString/utils/formatDuration.ts +2 -0
- package/src/organisms/CommandText/useCommandTextString/utils/getAddressableAreaDisplayName.ts +1 -1
- package/src/organisms/CommandText/useCommandTextString/utils/getFinalAddressableAreaCmd.ts +2 -0
- package/src/organisms/CommandText/useCommandTextString/utils/getFinalLabwareLocation.ts +2 -2
- package/src/organisms/CommandText/useCommandTextString/utils/getLabwareDefinitionsFromCommands.ts +10 -10
- package/src/organisms/CommandText/useCommandTextString/utils/getLabwareDisplayLocation.tsx +38 -15
- package/src/organisms/CommandText/useCommandTextString/utils/getLabwareLocation.tsx +21 -12
- package/src/organisms/CommandText/useCommandTextString/utils/getLabwareName.ts +2 -2
- package/src/organisms/CommandText/useCommandTextString/utils/getModuleDisplayLocation.ts +1 -0
- package/src/organisms/CommandText/useCommandTextString/utils/getModuleModel.ts +1 -0
- package/src/organisms/CommandText/useCommandTextString/utils/getWellRange.ts +2 -1
- package/src/organisms/DeckLabelSet/DeckLabelSet.stories.tsx +1 -2
- package/src/organisms/DeckLabelSet/__tests__/DeckLabelSet.test.tsx +3 -3
- package/src/organisms/DeckLabelSet/index.tsx +56 -25
- package/src/organisms/FixtureOption/__tests__/FixtureOption.test.tsx +40 -0
- package/src/organisms/FixtureOption/index.tsx +63 -0
- package/src/organisms/ProtocolDeck/index.tsx +118 -0
- package/src/organisms/ProtocolTimelineScrubber/CommandItem.tsx +8 -6
- package/src/organisms/ProtocolTimelineScrubber/PipetteVisuals.tsx +5 -3
- package/src/organisms/ProtocolTimelineScrubber/index.tsx +22 -45
- package/src/organisms/ProtocolTimelineScrubber/utils.ts +9 -6
- package/src/organisms/Toolbox/Toolbox.stories.tsx +1 -0
- package/src/organisms/Toolbox/__tests__/Toolbox.test.tsx +2 -1
- package/src/organisms/Toolbox/index.tsx +3 -2
- package/src/organisms/index.ts +2 -0
- package/src/primitives/Box.stories.tsx +1 -1
- package/src/primitives/Box.tsx +1 -1
- package/src/primitives/Btn.stories.tsx +8 -8
- package/src/primitives/Btn.tsx +2 -3
- package/src/primitives/Flex.stories.tsx +3 -3
- package/src/primitives/Flex.tsx +1 -1
- package/src/primitives/ForeignObject.tsx +20 -61
- package/src/primitives/Link.tsx +2 -2
- package/src/primitives/README.md +7 -16
- package/src/primitives/Svg.stories.tsx +2 -2
- package/src/primitives/Svg.tsx +2 -2
- package/src/primitives/Text.stories.tsx +2 -2
- package/src/primitives/Text.tsx +1 -1
- package/src/primitives/__tests__/Box.test.tsx +1 -0
- package/src/primitives/__tests__/Btn.test.tsx +1 -0
- package/src/primitives/__tests__/Flex.test.tsx +1 -0
- package/src/primitives/__tests__/Link.test.tsx +1 -0
- package/src/primitives/__tests__/Svg.test.tsx +1 -0
- package/src/primitives/__tests__/Text.test.tsx +1 -0
- package/src/primitives/__tests__/primitives.test.tsx +1 -0
- package/src/primitives/__tests__/style-props.test.tsx +1 -0
- package/src/primitives/style-props.ts +2 -2
- package/src/primitives/types.ts +1 -1
- package/src/slotmap/OT2SlotMap.tsx +1 -0
- package/src/slotmap/__tests__/OT2SlotMap.test.tsx +1 -0
- package/src/slotmap/styles.module.css +1 -1
- package/src/structure/LabeledValue.stories.tsx +2 -2
- package/src/structure/Pill.module.css +1 -1
- package/src/structure/Splash.module.css +1 -1
- package/src/structure/Splash.stories.tsx +4 -3
- package/src/structure/TitleBar.stories.tsx +4 -3
- package/src/structure/index.ts +2 -4
- package/src/structure/structure.module.css +11 -11
- package/src/styles/colors.module.css +1 -0
- package/src/styles/global.css +179 -0
- package/src/styles/index.module.css +1 -1
- package/src/styles/typography.module.css +1 -0
- package/src/testing/utils/matchers.ts +1 -0
- package/src/testing/utils/renderWithProviders.tsx +6 -9
- package/src/tooltips/DeprecatedTooltip.tsx +2 -1
- package/src/tooltips/LegacyTooltip.stories.tsx +10 -9
- package/src/tooltips/LegacyTooltip.tsx +5 -5
- package/src/tooltips/__tests__/Tooltip.test.tsx +1 -0
- package/src/tooltips/__tests__/useHoverTooltip.test.tsx +1 -0
- package/src/tooltips/__tests__/usePopper.test.tsx +1 -0
- package/src/tooltips/__tests__/useTooltip.test.tsx +1 -0
- package/src/tooltips/tooltips.module.css +14 -14
- package/src/tooltips/types.ts +2 -4
- package/src/tooltips/usePopper.ts +4 -4
- package/src/tooltips/useTooltip.ts +4 -3
- package/src/ui-style-constants/typography.ts +1 -0
- package/vite.config.mts +11 -4
- package/lib/atoms/ListButton/ListButtonChildren/ListButtonRadioButton.d.ts +0 -14
- package/lib/controls/LabeledToggle.d.ts +0 -11
- package/lib/hardware-sim/DeckConfigurator/AbsorbanceReaderFixture.d.ts +0 -10
- package/lib/hardware-sim/DeckConfigurator/EmptyConfigFixture.d.ts +0 -8
- package/lib/hardware-sim/DeckConfigurator/FlexStackerFixture.d.ts +0 -11
- package/lib/hardware-sim/DeckConfigurator/HeaterShakerFixture.d.ts +0 -10
- package/lib/hardware-sim/DeckConfigurator/MagneticBlockFixture.d.ts +0 -11
- package/lib/hardware-sim/DeckConfigurator/StagingAreaConfigFixture.d.ts +0 -10
- package/lib/hardware-sim/DeckConfigurator/TemperatureModuleFixture.d.ts +0 -10
- package/lib/hardware-sim/DeckConfigurator/ThermocyclerFixture.d.ts +0 -10
- package/lib/hardware-sim/DeckConfigurator/TrashBinConfigFixture.d.ts +0 -10
- package/lib/hardware-sim/DeckConfigurator/WasteChuteConfigFixture.d.ts +0 -11
- package/lib/hardware-sim/Labware/LabwareStackRender.d.ts +0 -20
- package/lib/hardware-sim/ProtocolDeck/LabwareInfo.d.ts +0 -6
- package/lib/hardware-sim/ProtocolDeck/types.d.ts +0 -8
- package/lib/hardware-sim/ProtocolDeck/utils/getInitiallyLoadedLabwareByAdapter.d.ts +0 -5
- package/lib/hardware-sim/ProtocolDeck/utils/getLabwareInSlots.d.ts +0 -12
- package/lib/hardware-sim/ProtocolDeck/utils/getLabwareInfoByLiquidId.d.ts +0 -3
- package/lib/hardware-sim/ProtocolDeck/utils/getModulesInSlots.d.ts +0 -10
- package/lib/hardware-sim/ProtocolDeck/utils/getStandardDeckViewLayerBlockList.d.ts +0 -2
- package/lib/hardware-sim/ProtocolDeck/utils/getWellFillFromLabwareId.d.ts +0 -4
- package/lib/hardware-sim/ProtocolDeck/utils/index.d.ts +0 -4
- package/lib/hardware-sim/utils.d.ts +0 -3
- package/lib/instrument/InstrumentGroup.d.ts +0 -11
- package/lib/instrument/InstrumentInfo.d.ts +0 -18
- package/lib/instrument/PipetteSelect.d.ts +0 -20
- package/lib/legacy-hardware-sim/ModuleItem.d.ts +0 -17
- package/lib/lists/TitledList.d.ts +0 -44
- package/lib/structure/Card.d.ts +0 -18
- package/src/atoms/ListButton/ListButtonChildren/ListButtonRadioButton.tsx +0 -108
- package/src/atoms/ListButton/__tests__/ListButtonRadioButton.test.tsx +0 -28
- package/src/controls/LabeledToggle.tsx +0 -35
- package/src/hardware-sim/Labware/LabwareStackRender.tsx +0 -273
- package/src/hardware-sim/ProtocolDeck/LabwareInfo.tsx +0 -69
- package/src/hardware-sim/ProtocolDeck/ProtocolDeck.stories.tsx +0 -25
- package/src/hardware-sim/ProtocolDeck/__fixtures__/analysis_QIAseqFX24xv4_8.json +0 -47145
- package/src/hardware-sim/ProtocolDeck/index.tsx +0 -85
- package/src/hardware-sim/ProtocolDeck/types.ts +0 -6
- package/src/hardware-sim/ProtocolDeck/utils/__tests__/getLabwareInforByLiquidId.test.ts +0 -158
- package/src/hardware-sim/ProtocolDeck/utils/getInitiallyLoadedLabwareByAdapter.ts +0 -33
- package/src/hardware-sim/ProtocolDeck/utils/getLabwareInSlots.ts +0 -321
- package/src/hardware-sim/ProtocolDeck/utils/getLabwareInfoByLiquidId.ts +0 -43
- package/src/hardware-sim/ProtocolDeck/utils/getModulesInSlots.ts +0 -129
- package/src/hardware-sim/ProtocolDeck/utils/getStandardDeckViewLayerBlockList.ts +0 -29
- package/src/hardware-sim/ProtocolDeck/utils/getWellFillFromLabwareId.ts +0 -30
- package/src/hardware-sim/ProtocolDeck/utils/index.ts +0 -4
- package/src/hardware-sim/utils.ts +0 -18
- package/src/instrument/InstrumentDiagram.stories.tsx +0 -42
- package/src/instrument/InstrumentGroup.stories.tsx +0 -88
- package/src/instrument/InstrumentGroup.tsx +0 -35
- package/src/instrument/InstrumentInfo.tsx +0 -106
- package/src/instrument/PipetteSelect.stories.tsx +0 -40
- package/src/instrument/PipetteSelect.tsx +0 -170
- package/src/instrument/__tests__/InstrumentInfo.test.tsx +0 -56
- package/src/instrument/__tests__/PipetteSelect.test.tsx +0 -4
- package/src/instrument/instrument.module.css +0 -45
- package/src/legacy-hardware-sim/ModuleItem.tsx +0 -145
- package/src/lists/TitledList.tsx +0 -155
- package/src/structure/Card.stories.tsx +0 -28
- package/src/structure/Card.tsx +0 -63
- /package/lib/atoms/{ListButton/__tests__/ListButtonRadioButton.test.d.ts → AnimationVideo/__tests__/AnimationVideo.test.d.ts} +0 -0
- /package/lib/{hardware-sim/ProtocolDeck/utils/__tests__/getLabwareInforByLiquidId.test.d.ts → atoms/InlineNotification/__tests__/InlineNotification.test.d.ts} +0 -0
- /package/lib/{instrument/__tests__/InstrumentInfo.test.d.ts → atoms/StepMeter/__tests__/StepMeter.test.d.ts} +0 -0
- /package/lib/{instrument/__tests__/PipetteSelect.test.d.ts → atoms/buttons/__tests__/BasicButton.test.d.ts} +0 -0
package/src/organisms/CommandText/useCommandTextString/utils/commandText/getLoadCommandText.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import find from 'lodash/find'
|
|
2
|
+
|
|
2
3
|
import {
|
|
3
4
|
getAllLiquidClassDefs,
|
|
4
5
|
getModuleDisplayName,
|
|
@@ -9,10 +10,10 @@ import {
|
|
|
9
10
|
THERMOCYCLER_MODULE_V2,
|
|
10
11
|
} from '@opentrons/shared-data'
|
|
11
12
|
|
|
12
|
-
import { getPipetteNameOnMount } from '../getPipetteNameOnMount'
|
|
13
|
-
import { getLiquidDisplayName } from '../getLiquidDisplayName'
|
|
14
|
-
import { getLabwareName } from '../getLabwareName'
|
|
15
13
|
import { getLabwareDisplayLocation } from '../getLabwareDisplayLocation'
|
|
14
|
+
import { getLabwareName } from '../getLabwareName'
|
|
15
|
+
import { getLiquidDisplayName } from '../getLiquidDisplayName'
|
|
16
|
+
import { getPipetteNameOnMount } from '../getPipetteNameOnMount'
|
|
16
17
|
|
|
17
18
|
import type { GetCommandText } from '../..'
|
|
18
19
|
|
package/src/organisms/CommandText/useCommandTextString/utils/commandText/getMoveToWellCommandText.ts
CHANGED
|
@@ -12,7 +12,12 @@ export function getMoveToWellCommandText({
|
|
|
12
12
|
commandTextData,
|
|
13
13
|
robotType,
|
|
14
14
|
}: HandlesCommands<MoveToWellRunTimeCommand>): string {
|
|
15
|
-
const { wellName, labwareId } = command.params
|
|
15
|
+
const { wellName, labwareId, wellLocation } = command.params
|
|
16
|
+
const {
|
|
17
|
+
x: xOffsetUnformatted,
|
|
18
|
+
y: yOffsetUnformatted,
|
|
19
|
+
z: zOffsetUnformatted,
|
|
20
|
+
} = wellLocation?.offset ?? { x: '', y: '', z: '' }
|
|
16
21
|
const allPreviousCommands = commandTextData?.commands.slice(
|
|
17
22
|
0,
|
|
18
23
|
commandTextData.commands.findIndex(c => c.id === command.id)
|
|
@@ -31,8 +36,15 @@ export function getMoveToWellCommandText({
|
|
|
31
36
|
t,
|
|
32
37
|
})
|
|
33
38
|
|
|
39
|
+
const xOffset =
|
|
40
|
+
typeof xOffsetUnformatted === 'number' ? xOffsetUnformatted?.toFixed(2) : ''
|
|
41
|
+
const yOffset =
|
|
42
|
+
typeof yOffsetUnformatted === 'number' ? yOffsetUnformatted?.toFixed(2) : ''
|
|
43
|
+
const zOffset =
|
|
44
|
+
typeof zOffsetUnformatted === 'number' ? zOffsetUnformatted?.toFixed(2) : ''
|
|
45
|
+
|
|
34
46
|
return t('move_to_well', {
|
|
35
|
-
|
|
47
|
+
wellName,
|
|
36
48
|
labware:
|
|
37
49
|
commandTextData != null
|
|
38
50
|
? getLabwareName({
|
|
@@ -41,6 +53,10 @@ export function getMoveToWellCommandText({
|
|
|
41
53
|
allRunDefs,
|
|
42
54
|
})
|
|
43
55
|
: null,
|
|
44
|
-
|
|
56
|
+
xOffset,
|
|
57
|
+
yOffset,
|
|
58
|
+
zOffset,
|
|
59
|
+
positionRelative: wellLocation?.origin,
|
|
60
|
+
displayLocation,
|
|
45
61
|
})
|
|
46
62
|
}
|
package/src/organisms/CommandText/useCommandTextString/utils/commandText/getPipettingCommandText.ts
CHANGED
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { getLabwareDefURI } from '@opentrons/shared-data'
|
|
2
2
|
|
|
3
|
+
import { getAddressableAreaDisplayName } from '../getAddressableAreaDisplayName'
|
|
4
|
+
import { getFinalMoveToAddressableAreaCmd } from '../getFinalAddressableAreaCmd'
|
|
3
5
|
import { getFinalLabwareLocation } from '../getFinalLabwareLocation'
|
|
4
|
-
import {
|
|
6
|
+
import { getLabwareDefinitionsFromCommands } from '../getLabwareDefinitionsFromCommands'
|
|
5
7
|
import { getLabwareDisplayLocation } from '../getLabwareDisplayLocation'
|
|
6
8
|
import { getLabwareName } from '../getLabwareName'
|
|
7
9
|
import { getLoadedLabware } from '../getLoadedLabware'
|
|
8
|
-
import {
|
|
9
|
-
|
|
10
|
-
import { getAddressableAreaDisplayName } from '../getAddressableAreaDisplayName'
|
|
10
|
+
import { getWellRange } from '../getWellRange'
|
|
11
|
+
|
|
11
12
|
import type { PipetteName, RunTimeCommand } from '@opentrons/shared-data'
|
|
12
13
|
import type { GetCommandText } from '../..'
|
|
13
14
|
|
|
@@ -57,9 +58,12 @@ export const getPipettingCommandText = ({
|
|
|
57
58
|
})
|
|
58
59
|
: null
|
|
59
60
|
|
|
61
|
+
const volume = formatCmdParamDecimal(command, 'volume')
|
|
62
|
+
const flowRate = formatCmdParamDecimal(command, 'flowRate')
|
|
63
|
+
const pushOutVolume = formatCmdParamDecimal(command, 'pushOut')
|
|
64
|
+
|
|
60
65
|
switch (command?.commandType) {
|
|
61
66
|
case 'aspirate': {
|
|
62
|
-
const { volume, flowRate } = command.params
|
|
63
67
|
return t('aspirate', {
|
|
64
68
|
well_name: wellName,
|
|
65
69
|
labware: labwareName,
|
|
@@ -69,15 +73,14 @@ export const getPipettingCommandText = ({
|
|
|
69
73
|
})
|
|
70
74
|
}
|
|
71
75
|
case 'dispense': {
|
|
72
|
-
|
|
73
|
-
return pushOut != null
|
|
76
|
+
return pushOutVolume != null
|
|
74
77
|
? t('dispense_push_out', {
|
|
75
78
|
well_name: wellName,
|
|
76
79
|
labware: labwareName,
|
|
77
80
|
labware_location: displayLocation,
|
|
78
81
|
volume,
|
|
79
82
|
flow_rate: flowRate,
|
|
80
|
-
push_out_volume:
|
|
83
|
+
push_out_volume: pushOutVolume,
|
|
81
84
|
})
|
|
82
85
|
: t('dispense', {
|
|
83
86
|
well_name: wellName,
|
|
@@ -88,7 +91,6 @@ export const getPipettingCommandText = ({
|
|
|
88
91
|
})
|
|
89
92
|
}
|
|
90
93
|
case 'blowout': {
|
|
91
|
-
const { flowRate } = command.params
|
|
92
94
|
return t('blowout', {
|
|
93
95
|
well_name: wellName,
|
|
94
96
|
labware: labwareName,
|
|
@@ -154,19 +156,15 @@ export const getPipettingCommandText = ({
|
|
|
154
156
|
}
|
|
155
157
|
}
|
|
156
158
|
case 'dispenseInPlace': {
|
|
157
|
-
const { volume, flowRate } = command.params
|
|
158
159
|
return t('dispense_in_place', { volume, flow_rate: flowRate })
|
|
159
160
|
}
|
|
160
161
|
case 'blowOutInPlace': {
|
|
161
|
-
const { flowRate } = command.params
|
|
162
162
|
return t('blowout_in_place', { flow_rate: flowRate })
|
|
163
163
|
}
|
|
164
164
|
case 'aspirateInPlace': {
|
|
165
|
-
const { flowRate, volume } = command.params
|
|
166
165
|
return t('aspirate_in_place', { volume, flow_rate: flowRate })
|
|
167
166
|
}
|
|
168
167
|
case 'airGapInPlace': {
|
|
169
|
-
const { volume } = command.params
|
|
170
168
|
return t('air_gap_in_place', { volume })
|
|
171
169
|
}
|
|
172
170
|
case 'sealPipetteToTip': {
|
|
@@ -182,7 +180,6 @@ export const getPipettingCommandText = ({
|
|
|
182
180
|
})
|
|
183
181
|
}
|
|
184
182
|
case 'pressureDispense': {
|
|
185
|
-
const { flowRate, volume } = command.params
|
|
186
183
|
return t('pressurizing_to_dispense', { volume, flow_rate: flowRate })
|
|
187
184
|
}
|
|
188
185
|
default: {
|
|
@@ -194,3 +191,16 @@ export const getPipettingCommandText = ({
|
|
|
194
191
|
}
|
|
195
192
|
}
|
|
196
193
|
}
|
|
194
|
+
|
|
195
|
+
// Format the given command param to two decimals if it exists and can be cast as a number.
|
|
196
|
+
const formatCmdParamDecimal = (
|
|
197
|
+
command: RunTimeCommand | null | undefined,
|
|
198
|
+
paramName: string
|
|
199
|
+
): string | null =>
|
|
200
|
+
command?.params &&
|
|
201
|
+
paramName in command.params &&
|
|
202
|
+
command.params[paramName as keyof typeof command.params] != null
|
|
203
|
+
? Number(command.params[paramName as keyof typeof command.params]).toFixed(
|
|
204
|
+
2
|
|
205
|
+
)
|
|
206
|
+
: null
|
package/src/organisms/CommandText/useCommandTextString/utils/commandText/getRobotCommandText.ts
ADDED
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { EXTENSION, LEFT, RIGHT } from '@opentrons/shared-data'
|
|
2
|
+
|
|
3
|
+
import type { TFunction } from 'i18next'
|
|
4
|
+
import type {
|
|
5
|
+
MotorAxis,
|
|
6
|
+
RobotCloseGripperJawRunTimeCommand,
|
|
7
|
+
RobotMotorAxisMap,
|
|
8
|
+
RobotMoveAxesRelativeRunTimeCommand,
|
|
9
|
+
RobotMoveAxesToRunTimeCommand,
|
|
10
|
+
RobotMoveToRunTimeCommand,
|
|
11
|
+
RobotOpenGripperJawRunTimeCommand,
|
|
12
|
+
} from '@opentrons/shared-data'
|
|
13
|
+
import type { HandlesCommands } from '../../'
|
|
14
|
+
|
|
15
|
+
const formatAxisMap = (axisMap: RobotMotorAxisMap, t: TFunction): string => {
|
|
16
|
+
const sortedAxes = [
|
|
17
|
+
'x',
|
|
18
|
+
'y',
|
|
19
|
+
'leftZ',
|
|
20
|
+
'rightZ',
|
|
21
|
+
'extensionZ',
|
|
22
|
+
'leftPlunger',
|
|
23
|
+
'rightPlunger',
|
|
24
|
+
'extensionJaw',
|
|
25
|
+
] as const
|
|
26
|
+
const names: Record<MotorAxis, string> = {
|
|
27
|
+
x: 'X',
|
|
28
|
+
y: 'Y',
|
|
29
|
+
leftZ: t('left_z'),
|
|
30
|
+
rightZ: t('right_z'),
|
|
31
|
+
leftPlunger: t('left_plunger'),
|
|
32
|
+
rightPlunger: t('right_plunger'),
|
|
33
|
+
extensionZ: t('extension_z'),
|
|
34
|
+
extensionJaw: t('extension_jaw'),
|
|
35
|
+
}
|
|
36
|
+
const coordinateStr = sortedAxes
|
|
37
|
+
.map(axis => {
|
|
38
|
+
if (Object.hasOwn(axisMap, axis)) {
|
|
39
|
+
return `${names[axis]}: ${axisMap[axis]}`
|
|
40
|
+
}
|
|
41
|
+
return undefined
|
|
42
|
+
})
|
|
43
|
+
.filter(x => x != null)
|
|
44
|
+
.join(', ')
|
|
45
|
+
return `(${coordinateStr})`
|
|
46
|
+
}
|
|
47
|
+
|
|
48
|
+
export type SupportedCommands =
|
|
49
|
+
| RobotMoveToRunTimeCommand
|
|
50
|
+
| RobotMoveAxesToRunTimeCommand
|
|
51
|
+
| RobotMoveAxesRelativeRunTimeCommand
|
|
52
|
+
| RobotOpenGripperJawRunTimeCommand
|
|
53
|
+
| RobotCloseGripperJawRunTimeCommand
|
|
54
|
+
|
|
55
|
+
export const getRobotCommandText = ({
|
|
56
|
+
command,
|
|
57
|
+
t,
|
|
58
|
+
}: HandlesCommands<SupportedCommands>): string => {
|
|
59
|
+
switch (command?.commandType) {
|
|
60
|
+
case 'robot/moveTo': {
|
|
61
|
+
const { destination, mount } = command.params
|
|
62
|
+
const gantryMountName = (): string => {
|
|
63
|
+
switch (mount) {
|
|
64
|
+
case LEFT:
|
|
65
|
+
return t('left_mount')
|
|
66
|
+
case RIGHT:
|
|
67
|
+
return t('right_mount')
|
|
68
|
+
case EXTENSION:
|
|
69
|
+
return t('extension_mount')
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
return t('robot_move_to', { ...destination, mount: gantryMountName() })
|
|
73
|
+
}
|
|
74
|
+
case 'robot/moveAxesTo':
|
|
75
|
+
return t('robot_move_axes_to', {
|
|
76
|
+
position: formatAxisMap(command.params.axis_map, t),
|
|
77
|
+
})
|
|
78
|
+
case 'robot/moveAxesRelative':
|
|
79
|
+
return t('robot_move_axes_relative', {
|
|
80
|
+
displacement: formatAxisMap(command.params.axis_map, t),
|
|
81
|
+
})
|
|
82
|
+
case 'robot/openGripperJaw':
|
|
83
|
+
return t('robot_open_gripper_jaw')
|
|
84
|
+
case 'robot/closeGripperJaw':
|
|
85
|
+
return t('robot_close_gripper_jaw')
|
|
86
|
+
}
|
|
87
|
+
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { formatDurationLabeled } from '../formatDuration'
|
|
2
|
+
|
|
2
3
|
import type {
|
|
3
|
-
TCRunExtendedProfileRunTimeCommand,
|
|
4
|
-
TCProfileCycle,
|
|
5
4
|
AtomicProfileStep,
|
|
5
|
+
TCProfileCycle,
|
|
6
|
+
TCRunExtendedProfileRunTimeCommand,
|
|
6
7
|
} from '@opentrons/shared-data/command'
|
|
7
8
|
import type { GetTCRunExtendedProfileCommandTextResult } from '../..'
|
|
8
9
|
import type { HandlesCommands } from '../types'
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import type {
|
|
2
|
-
TemperatureModuleAwaitTemperatureCreateCommand,
|
|
3
|
-
TemperatureModuleSetTargetTemperatureCreateCommand,
|
|
4
|
-
TCSetTargetBlockTemperatureCreateCommand,
|
|
5
|
-
TCSetTargetLidTemperatureCreateCommand,
|
|
6
2
|
HeaterShakerSetTargetTemperatureCreateCommand,
|
|
7
3
|
RunTimeCommand,
|
|
4
|
+
TCSetTargetBlockTemperatureCreateCommand,
|
|
5
|
+
TCSetTargetLidTemperatureCreateCommand,
|
|
6
|
+
TemperatureModuleAwaitTemperatureCreateCommand,
|
|
7
|
+
TemperatureModuleSetTargetTemperatureCreateCommand,
|
|
8
8
|
} from '@opentrons/shared-data'
|
|
9
9
|
import type { HandlesCommands } from '../types'
|
|
10
10
|
|
|
@@ -24,3 +24,5 @@ export * from './getPipettingCommandText'
|
|
|
24
24
|
export * from './getLiquidProbeCommandText'
|
|
25
25
|
export * from './getRailLightsCommandText'
|
|
26
26
|
export * from './getAbsorbanceReaderCommandText'
|
|
27
|
+
export * from './getFlexStackerCommandText'
|
|
28
|
+
export * from './getRobotCommandText'
|
package/src/organisms/CommandText/useCommandTextString/utils/getAddressableAreaDisplayName.ts
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
+
import type { TFunction } from 'i18next'
|
|
1
2
|
import type {
|
|
2
3
|
AddressableAreaName,
|
|
3
4
|
MoveToAddressableAreaParams,
|
|
4
5
|
RunTimeCommand,
|
|
5
6
|
} from '@opentrons/shared-data'
|
|
6
|
-
import type { TFunction } from 'i18next'
|
|
7
7
|
|
|
8
8
|
export function getAddressableAreaDisplayName(
|
|
9
9
|
commands: RunTimeCommand[] | undefined,
|
|
@@ -2,10 +2,10 @@ import { findLastAt } from './helpers'
|
|
|
2
2
|
|
|
3
3
|
import type {
|
|
4
4
|
LabwareLocation,
|
|
5
|
-
|
|
5
|
+
LabwareLocationSequence,
|
|
6
6
|
LoadLabwareRunTimeCommand,
|
|
7
7
|
MoveLabwareRunTimeCommand,
|
|
8
|
-
|
|
8
|
+
RunTimeCommand,
|
|
9
9
|
} from '@opentrons/shared-data'
|
|
10
10
|
|
|
11
11
|
/**
|
package/src/organisms/CommandText/useCommandTextString/utils/getLabwareDefinitionsFromCommands.ts
CHANGED
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import { getLabwareDefURI } from '@opentrons/shared-data'
|
|
2
2
|
|
|
3
3
|
import type {
|
|
4
|
-
|
|
5
|
-
RunTimeCommand,
|
|
4
|
+
LabwareDefinition,
|
|
6
5
|
LoadLabwareRunTimeCommand,
|
|
7
6
|
LoadLidRunTimeCommand,
|
|
7
|
+
RunTimeCommand,
|
|
8
8
|
} from '@opentrons/shared-data'
|
|
9
9
|
|
|
10
10
|
// Note: This is an O(n) operation.
|
|
11
11
|
export function getLabwareDefinitionsFromCommands(
|
|
12
12
|
commands: RunTimeCommand[]
|
|
13
|
-
):
|
|
14
|
-
return commands.reduce<
|
|
13
|
+
): LabwareDefinition[] {
|
|
14
|
+
return commands.reduce<LabwareDefinition[]>(
|
|
15
15
|
(acc, command) => [
|
|
16
16
|
...getLabwareDefinitionFromCommand(command, acc),
|
|
17
17
|
...acc,
|
|
@@ -21,11 +21,11 @@ export function getLabwareDefinitionsFromCommands(
|
|
|
21
21
|
}
|
|
22
22
|
|
|
23
23
|
function getNewLabwareDefinitions(
|
|
24
|
-
newDefinitions: Array<
|
|
25
|
-
knownDefinitions:
|
|
26
|
-
):
|
|
24
|
+
newDefinitions: Array<LabwareDefinition | null | undefined>,
|
|
25
|
+
knownDefinitions: LabwareDefinition[]
|
|
26
|
+
): LabwareDefinition[] {
|
|
27
27
|
return newDefinitions.filter(
|
|
28
|
-
(maybeNewDef): maybeNewDef is
|
|
28
|
+
(maybeNewDef): maybeNewDef is LabwareDefinition =>
|
|
29
29
|
maybeNewDef != null &&
|
|
30
30
|
!knownDefinitions.some(
|
|
31
31
|
knownDef => getLabwareDefURI(knownDef) === getLabwareDefURI(maybeNewDef)
|
|
@@ -40,8 +40,8 @@ const isLoadCommand = (
|
|
|
40
40
|
|
|
41
41
|
function getLabwareDefinitionFromCommand(
|
|
42
42
|
command: RunTimeCommand,
|
|
43
|
-
known:
|
|
44
|
-
):
|
|
43
|
+
known: LabwareDefinition[]
|
|
44
|
+
): LabwareDefinition[] {
|
|
45
45
|
if (isLoadCommand(command)) {
|
|
46
46
|
return getNewLabwareDefinitions([command.result?.definition], known)
|
|
47
47
|
}
|
|
@@ -1,28 +1,30 @@
|
|
|
1
1
|
import {
|
|
2
|
+
FLEX_STACKER_MODULE_V1,
|
|
2
3
|
getModuleDisplayName,
|
|
3
4
|
getModuleType,
|
|
4
5
|
getOccludedSlotCountForModule,
|
|
6
|
+
MOVABLE_TRASH_ADDRESSABLE_AREAS,
|
|
5
7
|
THERMOCYCLER_MODULE_V1,
|
|
6
8
|
THERMOCYCLER_MODULE_V2,
|
|
7
9
|
TRASH_BIN_FIXTURE,
|
|
8
10
|
WASTE_CHUTE_ADDRESSABLE_AREAS,
|
|
9
|
-
MOVABLE_TRASH_ADDRESSABLE_AREAS,
|
|
10
11
|
} from '@opentrons/shared-data'
|
|
12
|
+
|
|
11
13
|
import {
|
|
12
14
|
getLabwareLocation,
|
|
13
15
|
getLabwareLocationFromSequence,
|
|
14
16
|
} from './getLabwareLocation'
|
|
15
17
|
|
|
16
18
|
import type { TFunction } from 'i18next'
|
|
17
|
-
import type {
|
|
18
|
-
LocationFullParams,
|
|
19
|
-
LocationSlotOnlyParams,
|
|
20
|
-
} from './getLabwareLocation'
|
|
21
19
|
import type {
|
|
22
20
|
AddressableAreaName,
|
|
23
21
|
LabwareLocation,
|
|
24
22
|
LabwareLocationSequence,
|
|
25
23
|
} from '@opentrons/shared-data'
|
|
24
|
+
import type {
|
|
25
|
+
LocationFullParams,
|
|
26
|
+
LocationSlotOnlyParams,
|
|
27
|
+
} from './getLabwareLocation'
|
|
26
28
|
|
|
27
29
|
export interface DisplayLocationSlotOnlyParams
|
|
28
30
|
extends Omit<LocationSlotOnlyParams, 'location'> {
|
|
@@ -82,18 +84,35 @@ export function getLabwareDisplayLocation(
|
|
|
82
84
|
// Module location without adapter
|
|
83
85
|
else if (moduleModel != null && adapterName == null) {
|
|
84
86
|
if (params.detailLevel === 'slot-only') {
|
|
85
|
-
|
|
87
|
+
switch (moduleModel) {
|
|
88
|
+
case THERMOCYCLER_MODULE_V1:
|
|
89
|
+
case THERMOCYCLER_MODULE_V2:
|
|
90
|
+
return t('slot', { slot_name: 'A1+B1' })
|
|
91
|
+
case FLEX_STACKER_MODULE_V1:
|
|
92
|
+
return t('stacker_display_name', {
|
|
93
|
+
stacker_slot: getSlotColumn(slotName),
|
|
94
|
+
})
|
|
95
|
+
default:
|
|
96
|
+
return t('slot', { slot_name: slotName })
|
|
97
|
+
}
|
|
86
98
|
} else {
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
getModuleType(moduleModel),
|
|
92
|
-
params.robotType
|
|
93
|
-
),
|
|
94
|
-
module: getModuleDisplayName(moduleModel),
|
|
95
|
-
slot_name: slotName,
|
|
99
|
+
switch (moduleModel) {
|
|
100
|
+
case FLEX_STACKER_MODULE_V1:
|
|
101
|
+
return t('stacker_column_display_name', {
|
|
102
|
+
stacker_slot: getSlotColumn(slotName),
|
|
96
103
|
})
|
|
104
|
+
default:
|
|
105
|
+
return isOnDevice
|
|
106
|
+
? `${getModuleDisplayName(moduleModel)}, ${slotName}`
|
|
107
|
+
: t('module_in_slot', {
|
|
108
|
+
count: getOccludedSlotCountForModule(
|
|
109
|
+
getModuleType(moduleModel),
|
|
110
|
+
params.robotType
|
|
111
|
+
),
|
|
112
|
+
module: getModuleDisplayName(moduleModel),
|
|
113
|
+
slot_name: slotName,
|
|
114
|
+
})
|
|
115
|
+
}
|
|
97
116
|
}
|
|
98
117
|
}
|
|
99
118
|
// Adapter locations
|
|
@@ -119,6 +138,10 @@ export function getLabwareDisplayLocation(
|
|
|
119
138
|
}
|
|
120
139
|
}
|
|
121
140
|
|
|
141
|
+
function getSlotColumn(slotName: string): string {
|
|
142
|
+
return slotName.charAt(0)
|
|
143
|
+
}
|
|
144
|
+
|
|
122
145
|
// Sometimes we don't want to show the actual slotName, so we special case the text here.
|
|
123
146
|
function handleSpecialSlotNames(
|
|
124
147
|
slotName: string,
|
|
@@ -1,23 +1,25 @@
|
|
|
1
1
|
import {
|
|
2
|
+
FLEX_STACKER_MODULE_V1,
|
|
3
|
+
getCutoutDisplayName,
|
|
2
4
|
getLabwareDefURI,
|
|
3
5
|
getLabwareDisplayName,
|
|
4
|
-
getCutoutDisplayName,
|
|
5
|
-
getSlotFromAddressableAreaName,
|
|
6
6
|
getModuleModelFromAddressableArea,
|
|
7
|
+
getSlotFromAddressableAreaName,
|
|
7
8
|
MOVABLE_TRASH_ADDRESSABLE_AREAS,
|
|
8
9
|
WASTE_CHUTE_ADDRESSABLE_AREAS,
|
|
9
10
|
} from '@opentrons/shared-data'
|
|
11
|
+
|
|
10
12
|
import { getModuleDisplayLocation } from './getModuleDisplayLocation'
|
|
11
13
|
import { getModuleModel } from './getModuleModel'
|
|
12
14
|
|
|
13
15
|
import type {
|
|
14
|
-
|
|
16
|
+
AddressableAreaName,
|
|
17
|
+
CutoutId,
|
|
18
|
+
LabwareDefinition,
|
|
15
19
|
LabwareLocation,
|
|
20
|
+
LabwareLocationSequence,
|
|
16
21
|
ModuleModel,
|
|
17
22
|
RobotType,
|
|
18
|
-
LabwareLocationSequence,
|
|
19
|
-
CutoutId,
|
|
20
|
-
AddressableAreaName,
|
|
21
23
|
} from '@opentrons/shared-data'
|
|
22
24
|
import type { LoadedLabwares, LoadedModules } from './types'
|
|
23
25
|
|
|
@@ -47,11 +49,11 @@ export interface SequenceSlotOnlyParams extends SequenceBaseParams {
|
|
|
47
49
|
detailLevel: 'slot-only'
|
|
48
50
|
}
|
|
49
51
|
export interface LocationFullParams extends BaseParams {
|
|
50
|
-
allRunDefs:
|
|
52
|
+
allRunDefs: LabwareDefinition[]
|
|
51
53
|
detailLevel?: 'full'
|
|
52
54
|
}
|
|
53
55
|
export interface SequenceFullParams extends SequenceBaseParams {
|
|
54
|
-
allRunDefs:
|
|
56
|
+
allRunDefs: LabwareDefinition[]
|
|
55
57
|
detailLevel?: 'full'
|
|
56
58
|
}
|
|
57
59
|
|
|
@@ -72,7 +74,6 @@ export function getLabwareLocationFromSequence(
|
|
|
72
74
|
locationSequence,
|
|
73
75
|
detailLevel = 'full',
|
|
74
76
|
} = params
|
|
75
|
-
|
|
76
77
|
return locationSequence.reduce<LocationResult>(
|
|
77
78
|
(acc, sequenceItem, index) => {
|
|
78
79
|
if (sequenceItem.kind === 'notOnDeck') {
|
|
@@ -111,7 +112,10 @@ export function getLabwareLocationFromSequence(
|
|
|
111
112
|
return {
|
|
112
113
|
...acc,
|
|
113
114
|
slotName,
|
|
114
|
-
moduleModel:
|
|
115
|
+
moduleModel:
|
|
116
|
+
moduleModel === FLEX_STACKER_MODULE_V1
|
|
117
|
+
? undefined
|
|
118
|
+
: moduleModel ?? undefined,
|
|
115
119
|
}
|
|
116
120
|
} else if (sequenceItem.kind === 'onModule') {
|
|
117
121
|
const moduleModel = getModuleModel(loadedModules, sequenceItem.moduleId)
|
|
@@ -120,10 +124,15 @@ export function getLabwareLocationFromSequence(
|
|
|
120
124
|
} else {
|
|
121
125
|
return {
|
|
122
126
|
...acc,
|
|
123
|
-
moduleModel
|
|
127
|
+
moduleModel:
|
|
128
|
+
moduleModel === FLEX_STACKER_MODULE_V1
|
|
129
|
+
? undefined
|
|
130
|
+
: moduleModel ?? undefined,
|
|
124
131
|
}
|
|
125
132
|
}
|
|
126
|
-
}
|
|
133
|
+
}
|
|
134
|
+
// TODO(tz, 4-16-25): add inHopperLocation when logic is merged
|
|
135
|
+
else if (detailLevel === 'full') {
|
|
127
136
|
const { allRunDefs } = params as SequenceFullParams
|
|
128
137
|
if (sequenceItem.kind === 'onLabware' && acc.adapterName == null) {
|
|
129
138
|
if (!Array.isArray(loadedLabwares)) {
|
|
@@ -2,7 +2,7 @@ import { getLabwareDefURI, getLabwareDisplayName } from '@opentrons/shared-data'
|
|
|
2
2
|
|
|
3
3
|
import { getLoadedLabware } from './getLoadedLabware'
|
|
4
4
|
|
|
5
|
-
import type {
|
|
5
|
+
import type { LabwareDefinition } from '@opentrons/shared-data'
|
|
6
6
|
import type { LoadedLabwares } from './types'
|
|
7
7
|
|
|
8
8
|
const FIXED_TRASH_DEF_URIS = [
|
|
@@ -13,7 +13,7 @@ const FIXED_TRASH_DEF_URIS = [
|
|
|
13
13
|
const LID_STACK_OBJECT_LOADNAME = 'protocol_engine_lid_stack_object'
|
|
14
14
|
|
|
15
15
|
export interface GetLabwareNameParams {
|
|
16
|
-
allRunDefs:
|
|
16
|
+
allRunDefs: LabwareDefinition[]
|
|
17
17
|
loadedLabwares: LoadedLabwares
|
|
18
18
|
labwareId: string
|
|
19
19
|
}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
+
import { DeckLabelSet as DeckLabelSetComponent } from '.'
|
|
1
2
|
import { BORDERS } from '../../helix-design-system'
|
|
2
3
|
import { Flex } from '../../primitives'
|
|
3
4
|
import { SPACING } from '../../ui-style-constants'
|
|
4
5
|
|
|
5
|
-
import { DeckLabelSet as DeckLabelSetComponent } from '.'
|
|
6
|
-
|
|
7
6
|
import type { Meta, StoryObj } from '@storybook/react'
|
|
8
7
|
|
|
9
8
|
const mockDeckLabels = [
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { describe, it, vi, beforeEach, expect } from 'vitest'
|
|
2
1
|
import { screen } from '@testing-library/react'
|
|
2
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
|
3
3
|
|
|
4
|
-
import {
|
|
4
|
+
import { DeckLabelSet } from '..'
|
|
5
5
|
import { BORDERS, COLORS } from '../../../helix-design-system'
|
|
6
6
|
import { DeckLabel } from '../../../molecules/DeckLabel'
|
|
7
|
-
import {
|
|
7
|
+
import { renderWithProviders } from '../../../testing/utils'
|
|
8
8
|
|
|
9
9
|
import type { ComponentProps } from 'react'
|
|
10
10
|
|