@opentrons/components 0.1.7-alpha.0 → 0.1.7-alpha.1
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/lib/assets/localization/en/index.d.ts +14 -0
- package/lib/assets/localization/index.d.ts +14 -0
- package/lib/atoms/Chip/index.d.ts +2 -0
- package/lib/atoms/InlineNotification/index.d.ts +18 -0
- package/lib/atoms/ListButton/index.d.ts +5 -0
- package/lib/atoms/ListItem/ListItemChildren/ListItemDescriptor.d.ts +4 -0
- package/lib/atoms/StyledText/StyledText.d.ts +1 -1
- 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/LargeButton.d.ts +1 -1
- package/lib/atoms/buttons/RadioButton.d.ts +29 -1
- package/lib/atoms/index.d.ts +3 -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 +13 -1
- package/lib/hardware-sim/BaseDeck/WasteChuteFixture.d.ts +1 -1
- package/lib/hardware-sim/Deck/MoveLabwareOnDeck.d.ts +1 -1
- package/lib/hardware-sim/Deck/RobotWorkSpace.d.ts +1 -1
- package/lib/hardware-sim/Labware/Labware.d.ts +2 -2
- package/lib/hardware-sim/Labware/LabwareAdapter/index.d.ts +2 -2
- package/lib/hardware-sim/Labware/LabwareRender.d.ts +2 -2
- package/lib/hardware-sim/Labware/index.d.ts +0 -1
- package/lib/hardware-sim/Labware/labwareInternals/FilledWells.d.ts +1 -1
- package/lib/hardware-sim/Labware/labwareInternals/StaticLabware.d.ts +1 -1
- package/lib/hardware-sim/Labware/labwareInternals/StrokedWells.d.ts +1 -1
- package/lib/hardware-sim/Labware/labwareInternals/Well.d.ts +1 -1
- 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 +1 -1
- package/lib/hardware-sim/index.d.ts +0 -2
- package/lib/helix-design-system/colors.d.ts +2 -1
- package/lib/hooks/useSwipe.d.ts +1 -1
- package/lib/icons/ModuleIcon.d.ts +1 -1
- package/lib/icons/NotificationIcon.d.ts +1 -1
- package/lib/instrument/InstrumentDiagram.d.ts +1 -1
- package/lib/instrument/index.d.ts +0 -1
- package/lib/legacy-hardware-sim/ModuleItem.d.ts +1 -1
- package/lib/molecules/Banner/index.d.ts +1 -1
- package/lib/molecules/DropdownMenu/index.d.ts +1 -1
- package/lib/molecules/LiquidIcon/index.d.ts +2 -2
- package/lib/organisms/CommandText/useCommandTextString/index.d.ts +2 -2
- 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/getLabwareDisplayLocation.d.ts +1 -1
- package/lib/organisms/CommandText/useCommandTextString/utils/getLabwareLocation.d.ts +1 -1
- 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/organisms/ProtocolTimelineScrubber/utils.d.ts +1 -1
- package/lib/organisms/index.d.ts +1 -0
- package/lib/primitives/ForeignObject.d.ts +1 -1
- 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/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 +2 -3
- 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/assets/localization/en/protocol_command_text.json +14 -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 -35
- 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 +197 -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 +4 -2
- package/src/atoms/ListButton/ListButtonChildren/ListButtonRadioButton.tsx +3 -2
- package/src/atoms/ListButton/__tests__/ListButton.test.tsx +5 -3
- package/src/atoms/ListButton/__tests__/ListButtonAccordion.test.tsx +2 -2
- package/src/atoms/ListButton/__tests__/ListButtonRadioButton.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 +4 -0
- 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 +1 -1
- 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 +4 -2
- package/src/atoms/Snackbar/__tests__/Snackbar.test.tsx +6 -3
- package/src/atoms/Snackbar/index.tsx +3 -2
- 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/StyledText.stories.tsx +3 -2
- package/src/atoms/StyledText/StyledText.tsx +4 -3
- 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/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 +13 -7
- 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__/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 +6 -6
- package/src/atoms/index.ts +3 -2
- package/src/buttons/Button.tsx +2 -3
- package/src/buttons/IconButton.tsx +1 -2
- package/src/controls/LabeledRadioGroup.tsx +1 -1
- package/src/controls/ToggleButton.tsx +62 -18
- package/src/controls/index.ts +0 -1
- 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.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/hardware-sim/BaseDeck/BaseDeck.stories.tsx +1 -1
- package/src/hardware-sim/BaseDeck/BaseDeck.tsx +121 -21
- package/src/hardware-sim/BaseDeck/WasteChuteFixture.tsx +5 -5
- package/src/hardware-sim/BaseDeck/__fixtures__/index.ts +2 -2
- package/src/hardware-sim/Deck/DeckFromLayers.tsx +6 -5
- package/src/hardware-sim/Deck/FlexTrash.tsx +2 -1
- package/src/hardware-sim/Deck/MoveLabwareOnDeck.stories.tsx +4 -3
- package/src/hardware-sim/Deck/MoveLabwareOnDeck.tsx +12 -12
- package/src/hardware-sim/Deck/RobotCoordsForeignObject.tsx +1 -0
- package/src/hardware-sim/Deck/RobotWorkSpace.tsx +3 -1
- package/src/hardware-sim/Deck/SlotLabels.tsx +2 -0
- package/src/hardware-sim/DeckConfigurator/AbsorbanceReaderFixture.tsx +2 -2
- package/src/hardware-sim/DeckConfigurator/DeckConfigurator.stories.tsx +2 -3
- package/src/hardware-sim/DeckConfigurator/EmptyConfigFixture.tsx +4 -3
- package/src/hardware-sim/DeckConfigurator/FlexStackerFixture.tsx +2 -2
- package/src/hardware-sim/DeckConfigurator/HeaterShakerFixture.tsx +3 -3
- package/src/hardware-sim/DeckConfigurator/MagneticBlockFixture.tsx +6 -6
- package/src/hardware-sim/DeckConfigurator/StagingAreaConfigFixture.tsx +1 -1
- package/src/hardware-sim/DeckConfigurator/StaticFixture.tsx +2 -2
- package/src/hardware-sim/DeckConfigurator/TemperatureModuleFixture.tsx +3 -3
- package/src/hardware-sim/DeckConfigurator/ThermocyclerFixture.tsx +4 -4
- package/src/hardware-sim/DeckConfigurator/TrashBinConfigFixture.tsx +3 -3
- package/src/hardware-sim/DeckConfigurator/WasteChuteConfigFixture.tsx +3 -3
- package/src/hardware-sim/DeckConfigurator/index.tsx +29 -16
- package/src/hardware-sim/Labware/Labware.tsx +5 -7
- package/src/hardware-sim/Labware/LabwareAdapter/index.tsx +5 -4
- package/src/hardware-sim/Labware/LabwareRender.stories.tsx +4 -5
- package/src/hardware-sim/Labware/LabwareRender.tsx +8 -9
- package/src/hardware-sim/Labware/__tests__/Labware.test.tsx +6 -2
- package/src/hardware-sim/Labware/__tests__/LabwareRender.test.tsx +6 -2
- package/src/hardware-sim/Labware/index.ts +0 -1
- package/src/hardware-sim/Labware/labwareInternals/FilledWells.tsx +2 -1
- package/src/hardware-sim/Labware/labwareInternals/LabwareOutline.tsx +9 -4
- package/src/hardware-sim/Labware/labwareInternals/LabwareWellLabels.tsx +2 -1
- package/src/hardware-sim/Labware/labwareInternals/StaticLabware.tsx +5 -5
- package/src/hardware-sim/Labware/labwareInternals/StrokedWells.tsx +3 -2
- package/src/hardware-sim/Labware/labwareInternals/StyledWells.tsx +2 -1
- package/src/hardware-sim/Labware/labwareInternals/Well.tsx +5 -2
- package/src/hardware-sim/Labware/labwareInternals/WellLabels.tsx +2 -1
- package/src/hardware-sim/Labware/labwareInternals/__tests__/LabwareWellLabels.test.tsx +4 -1
- package/src/hardware-sim/Labware/labwareInternals/__tests__/StrokedWells.test.tsx +5 -1
- package/src/hardware-sim/Labware/labwareInternals/__tests__/WellLabels.test.tsx +6 -2
- 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 +4 -3
- 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 +3 -3
- package/src/hardware-sim/Module/index.tsx +14 -7
- 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 +4 -2
- package/src/hardware-sim/Pipette/PipetteRender.tsx +7 -5
- 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 +9 -7
- package/src/hardware-sim/RobotCoordinateSpace/RobotCoordinateSpace.tsx +2 -1
- package/src/hardware-sim/RobotCoordinateSpace/RobotCoordinateSpaceWithRef.tsx +1 -0
- package/src/hardware-sim/index.ts +0 -2
- package/src/helix-design-system/colors.ts +2 -1
- 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/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 +1 -1
- package/src/icons/IconList.stories.tsx +9 -8
- package/src/icons/ModuleIcon.tsx +8 -7
- package/src/icons/NotificationIcon.tsx +1 -1
- package/src/icons/icon-data.ts +5 -0
- package/src/instrument/InstrumentDiagram.stories.tsx +3 -2
- package/src/instrument/InstrumentDiagram.tsx +9 -8
- package/src/instrument/InstrumentGroup.stories.tsx +4 -3
- package/src/instrument/InstrumentGroup.tsx +1 -1
- package/src/instrument/InstrumentInfo.tsx +4 -4
- package/src/instrument/__tests__/InstrumentInfo.test.tsx +5 -3
- package/src/instrument/index.ts +0 -1
- 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.tsx +1 -0
- package/src/legacy-hardware-sim/ModuleItem.tsx +2 -2
- package/src/lists/SidePanelGroup.tsx +1 -1
- package/src/lists/TitledList.tsx +2 -3
- 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/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/DeckInfoLabel/DeckInfoLabel.stories.tsx +1 -1
- package/src/molecules/DeckInfoLabel/__tests__/DeckInfoLabel.test.tsx +4 -4
- 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 +5 -2
- 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 +2 -2
- 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/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/nav/SidePanel.stories.tsx +4 -3
- package/src/organisms/CommandText/CommandText.stories.tsx +3 -2
- package/src/organisms/CommandText/__tests__/CommandText.test.tsx +7 -6
- package/src/organisms/CommandText/fixtures/index.ts +1 -0
- package/src/organisms/CommandText/index.tsx +4 -2
- package/src/organisms/CommandText/useCommandTextString/index.ts +28 -5
- package/src/organisms/CommandText/useCommandTextString/utils/__tests__/formatDuration.test.tsx +2 -1
- package/src/organisms/CommandText/useCommandTextString/utils/__tests__/getFinalLabwareLocation.test.ts +4 -1
- 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 +10 -9
- 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 +142 -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/getPipettingCommandText.ts +5 -4
- 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 +1 -1
- package/src/organisms/CommandText/useCommandTextString/utils/getLabwareDisplayLocation.tsx +38 -15
- package/src/organisms/CommandText/useCommandTextString/utils/getLabwareLocation.tsx +18 -9
- 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 +55 -22
- package/src/organisms/FixtureOption/__tests__/FixtureOption.test.tsx +42 -0
- package/src/organisms/FixtureOption/index.tsx +92 -0
- package/src/organisms/ProtocolTimelineScrubber/CommandItem.tsx +6 -4
- package/src/organisms/ProtocolTimelineScrubber/PipetteVisuals.tsx +4 -2
- package/src/organisms/ProtocolTimelineScrubber/index.tsx +22 -45
- package/src/organisms/ProtocolTimelineScrubber/utils.ts +6 -3
- 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 +1 -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 +2 -2
- 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 +1 -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/structure/Card.stories.tsx +4 -3
- package/src/structure/Card.tsx +3 -1
- package/src/structure/LabeledValue.stories.tsx +2 -2
- package/src/structure/Splash.stories.tsx +4 -3
- package/src/structure/TitleBar.stories.tsx +4 -3
- package/src/testing/utils/matchers.ts +1 -0
- package/src/testing/utils/renderWithProviders.tsx +4 -4
- 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/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 +5 -1
- package/lib/controls/LabeledToggle.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/index.d.ts +0 -11
- 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/instrument/PipetteSelect.d.ts +0 -20
- 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/instrument/PipetteSelect.stories.tsx +0 -40
- package/src/instrument/PipetteSelect.tsx +0 -170
- package/src/instrument/__tests__/PipetteSelect.test.tsx +0 -4
- /package/lib/{hardware-sim/ProtocolDeck/utils/__tests__/getLabwareInforByLiquidId.test.d.ts → atoms/InlineNotification/__tests__/InlineNotification.test.d.ts} +0 -0
- /package/lib/{instrument/__tests__/PipetteSelect.test.d.ts → atoms/StepMeter/__tests__/StepMeter.test.d.ts} +0 -0
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
import { useTranslation } from 'react-i18next'
|
|
2
|
+
import { screen } from '@testing-library/react'
|
|
3
|
+
import { beforeEach, describe, it, vi } from 'vitest'
|
|
4
|
+
|
|
5
|
+
import { getLabwareDefURI } from '@opentrons/shared-data'
|
|
6
|
+
|
|
7
|
+
import { i18n } from '../../../../../../i18n'
|
|
8
|
+
import { renderWithProviders } from '../../../../../../testing/utils'
|
|
9
|
+
import { getLabwareDisplayLocation } from '../../getLabwareDisplayLocation'
|
|
10
|
+
import {
|
|
11
|
+
getFlexStackerCommandText,
|
|
12
|
+
KEYS_BY_COMMAND_TYPE,
|
|
13
|
+
} from '../getFlexStackerCommandText'
|
|
14
|
+
|
|
15
|
+
vi.mock('@opentrons/shared-data')
|
|
16
|
+
vi.mock('../../getLabwareDisplayLocation')
|
|
17
|
+
|
|
18
|
+
const baseCommandData = {
|
|
19
|
+
allRunDefs: [
|
|
20
|
+
{ metadata: { displayName: 'tip rack' } },
|
|
21
|
+
{ metadata: { displayName: 'plate' } },
|
|
22
|
+
],
|
|
23
|
+
robotType: 'OT-2',
|
|
24
|
+
commandTextData: {
|
|
25
|
+
commands: [],
|
|
26
|
+
labware: [],
|
|
27
|
+
modules: [],
|
|
28
|
+
pipettes: [{ id: 'pipette-1', pipetteName: 'p300_single' }],
|
|
29
|
+
},
|
|
30
|
+
} as any
|
|
31
|
+
|
|
32
|
+
function TestWrapper({ command }: { command: any }): JSX.Element {
|
|
33
|
+
const { t } = useTranslation(['protocol_command_text', 'branded'])
|
|
34
|
+
const text = getFlexStackerCommandText({
|
|
35
|
+
command,
|
|
36
|
+
...baseCommandData,
|
|
37
|
+
t,
|
|
38
|
+
})
|
|
39
|
+
|
|
40
|
+
return <div>{text}</div>
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
const render = (command: any) => {
|
|
44
|
+
return renderWithProviders(<TestWrapper command={command} />, {
|
|
45
|
+
i18nInstance: i18n,
|
|
46
|
+
})
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
describe('getPipettingCommandText', () => {
|
|
50
|
+
beforeEach(() => {
|
|
51
|
+
vi.mocked(getLabwareDefURI).mockReturnValue('tiprack-uri')
|
|
52
|
+
vi.mocked(getLabwareDisplayLocation).mockReturnValue('Slot 1')
|
|
53
|
+
})
|
|
54
|
+
|
|
55
|
+
it('should render retrieve command text correctly', () => {
|
|
56
|
+
const command = {
|
|
57
|
+
id: 'cmd-1',
|
|
58
|
+
commandType: 'flexStacker/retrieve',
|
|
59
|
+
params: {
|
|
60
|
+
moduleId: 'module-id',
|
|
61
|
+
},
|
|
62
|
+
result: {
|
|
63
|
+
primaryLabwareURI: 'tiprack-uri',
|
|
64
|
+
},
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
render(command)
|
|
68
|
+
screen.getByText('retrieve_labware_from_stacker_to')
|
|
69
|
+
})
|
|
70
|
+
|
|
71
|
+
it('should render store command text correctly', () => {
|
|
72
|
+
const command = {
|
|
73
|
+
id: 'cmd-1',
|
|
74
|
+
commandType: 'flexStacker/store',
|
|
75
|
+
params: {
|
|
76
|
+
moduleId: 'module-id',
|
|
77
|
+
},
|
|
78
|
+
result: {
|
|
79
|
+
primaryLabwareURI: 'tiprack-uri',
|
|
80
|
+
primaryOriginLocationSequence: [
|
|
81
|
+
{ kind: 'onAddressableArea', addressableAreaName: 'A1' },
|
|
82
|
+
],
|
|
83
|
+
},
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
render(command)
|
|
87
|
+
screen.getByText('store_labware_from_slot_to_stacker')
|
|
88
|
+
})
|
|
89
|
+
|
|
90
|
+
it('should render setStoredLabware command text correctly', () => {
|
|
91
|
+
const command = {
|
|
92
|
+
id: 'cmd-1',
|
|
93
|
+
commandType: 'flexStacker/setStoredLabware',
|
|
94
|
+
params: {
|
|
95
|
+
moduleId: 'module-id',
|
|
96
|
+
},
|
|
97
|
+
result: {
|
|
98
|
+
primaryLabwareURI: 'tiprack-uri',
|
|
99
|
+
primaryLabwareDefinition: {
|
|
100
|
+
metadata: {
|
|
101
|
+
displayName: 'dummy def',
|
|
102
|
+
},
|
|
103
|
+
},
|
|
104
|
+
primaryOriginLocationSequence: [
|
|
105
|
+
{ kind: 'onAddressableArea', addressableAreaName: 'A1' },
|
|
106
|
+
],
|
|
107
|
+
},
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
render(command)
|
|
111
|
+
screen.getByText(
|
|
112
|
+
'flex_stacker_set_stored_labware_with_quantity_and_location'
|
|
113
|
+
)
|
|
114
|
+
})
|
|
115
|
+
|
|
116
|
+
it('should render fill command text correctly', () => {
|
|
117
|
+
const command = {
|
|
118
|
+
id: 'cmd-1',
|
|
119
|
+
commandType: 'flexStacker/fill',
|
|
120
|
+
params: {
|
|
121
|
+
moduleId: 'module-id',
|
|
122
|
+
},
|
|
123
|
+
result: {
|
|
124
|
+
primaryLabwareURI: 'tiprack-uri',
|
|
125
|
+
primaryLabwareDefinition: {
|
|
126
|
+
metadata: {
|
|
127
|
+
displayName: 'dummy def',
|
|
128
|
+
},
|
|
129
|
+
},
|
|
130
|
+
primaryOriginLocationSequence: [
|
|
131
|
+
{ kind: 'onAddressableArea', addressableAreaName: 'A1' },
|
|
132
|
+
],
|
|
133
|
+
},
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
render(command)
|
|
137
|
+
screen.getByText('flex_stacker_fill_with_quantity_and_labware')
|
|
138
|
+
})
|
|
139
|
+
|
|
140
|
+
it('should render empty command text correctly', () => {
|
|
141
|
+
const command = {
|
|
142
|
+
id: 'cmd-1',
|
|
143
|
+
commandType: 'flexStacker/empty',
|
|
144
|
+
params: {
|
|
145
|
+
moduleId: 'module-id',
|
|
146
|
+
},
|
|
147
|
+
result: {
|
|
148
|
+
primaryLabwareURI: 'tiprack-uri',
|
|
149
|
+
primaryLabwareDefinition: {
|
|
150
|
+
metadata: {
|
|
151
|
+
displayName: 'dummy def',
|
|
152
|
+
},
|
|
153
|
+
},
|
|
154
|
+
primaryOriginLocationSequence: [
|
|
155
|
+
{ kind: 'onAddressableArea', addressableAreaName: 'A1' },
|
|
156
|
+
],
|
|
157
|
+
},
|
|
158
|
+
}
|
|
159
|
+
render(command)
|
|
160
|
+
screen.getByText('flex_stacker_empty_from_location')
|
|
161
|
+
})
|
|
162
|
+
})
|
|
163
|
+
|
|
164
|
+
describe.each(Object.entries(KEYS_BY_COMMAND_TYPE))(
|
|
165
|
+
'Default fallback for %s',
|
|
166
|
+
(commandType, expectedKey) => {
|
|
167
|
+
it(`should render default text for ${commandType} when result is missing`, () => {
|
|
168
|
+
const command = {
|
|
169
|
+
id: 'cmd-1',
|
|
170
|
+
commandType: commandType,
|
|
171
|
+
params: {
|
|
172
|
+
moduleId: 'module-id',
|
|
173
|
+
},
|
|
174
|
+
}
|
|
175
|
+
render(command)
|
|
176
|
+
screen.getByText(expectedKey)
|
|
177
|
+
})
|
|
178
|
+
}
|
|
179
|
+
)
|
|
@@ -1,19 +1,20 @@
|
|
|
1
|
-
import { screen } from '@testing-library/react'
|
|
2
|
-
import { vi, describe, it, beforeEach } from 'vitest'
|
|
3
1
|
import { useTranslation } from 'react-i18next'
|
|
2
|
+
import { screen } from '@testing-library/react'
|
|
3
|
+
import { beforeEach, describe, it, vi } from 'vitest'
|
|
4
4
|
|
|
5
|
-
import { renderWithProviders } from '../../../../../../testing/utils'
|
|
6
|
-
import { i18n } from '../../../../../../i18n'
|
|
7
|
-
import { getPipettingCommandText } from '../getPipettingCommandText'
|
|
8
5
|
import { getLabwareDefURI } from '@opentrons/shared-data'
|
|
6
|
+
|
|
7
|
+
import { i18n } from '../../../../../../i18n'
|
|
8
|
+
import { renderWithProviders } from '../../../../../../testing/utils'
|
|
9
|
+
import { getAddressableAreaDisplayName } from '../../getAddressableAreaDisplayName'
|
|
10
|
+
import { getFinalMoveToAddressableAreaCmd } from '../../getFinalAddressableAreaCmd'
|
|
9
11
|
import { getFinalLabwareLocation } from '../../getFinalLabwareLocation'
|
|
10
|
-
import { getWellRange } from '../../getWellRange'
|
|
11
12
|
import { getLabwareDefinitionsFromCommands } from '../../getLabwareDefinitionsFromCommands'
|
|
13
|
+
import { getLabwareDisplayLocation } from '../../getLabwareDisplayLocation'
|
|
12
14
|
import { getLabwareName } from '../../getLabwareName'
|
|
13
15
|
import { getLoadedLabware } from '../../getLoadedLabware'
|
|
14
|
-
import {
|
|
15
|
-
import {
|
|
16
|
-
import { getAddressableAreaDisplayName } from '../../getAddressableAreaDisplayName'
|
|
16
|
+
import { getWellRange } from '../../getWellRange'
|
|
17
|
+
import { getPipettingCommandText } from '../getPipettingCommandText'
|
|
17
18
|
|
|
18
19
|
vi.mock('@opentrons/shared-data')
|
|
19
20
|
vi.mock('../../getFinalLabwareLocation')
|
|
@@ -0,0 +1,118 @@
|
|
|
1
|
+
import { useTranslation } from 'react-i18next'
|
|
2
|
+
import { screen } from '@testing-library/react'
|
|
3
|
+
import { describe, it } from 'vitest'
|
|
4
|
+
|
|
5
|
+
import { i18n } from '../../../../../../i18n'
|
|
6
|
+
import { renderWithProviders } from '../../../../../../testing/utils'
|
|
7
|
+
import { getRobotCommandText } from '../getRobotCommandText'
|
|
8
|
+
|
|
9
|
+
import type { HandlesCommands } from '../../types'
|
|
10
|
+
import type { SupportedCommands } from '../getRobotCommandText'
|
|
11
|
+
|
|
12
|
+
function TestWrapper({ command }: { command: SupportedCommands }): JSX.Element {
|
|
13
|
+
const { t } = useTranslation('protocol_command_text')
|
|
14
|
+
const text = getRobotCommandText({
|
|
15
|
+
command,
|
|
16
|
+
t,
|
|
17
|
+
} as HandlesCommands<SupportedCommands>)
|
|
18
|
+
return <div>{text}</div>
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const render = (command: any) => {
|
|
22
|
+
return renderWithProviders(<TestWrapper command={command} />, {
|
|
23
|
+
i18nInstance: i18n,
|
|
24
|
+
})
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
describe('getRobotCommandText', () => {
|
|
28
|
+
it('should render openGripperJaw', () => {
|
|
29
|
+
render({ commandType: 'robot/openGripperJaw' } as SupportedCommands)
|
|
30
|
+
screen.getByText(/Opening robot gripper jaw/)
|
|
31
|
+
})
|
|
32
|
+
it('should render closeGripperJaw', () => {
|
|
33
|
+
render({ commandType: 'robot/closeGripperJaw' } as SupportedCommands)
|
|
34
|
+
screen.getByText(/Closing robot gripper jaw/)
|
|
35
|
+
})
|
|
36
|
+
;(['left', 'right', 'extension'] as const).forEach(mountName =>
|
|
37
|
+
it(`should render moveAxes {mountName}`, () => {
|
|
38
|
+
render({
|
|
39
|
+
commandType: 'robot/moveTo',
|
|
40
|
+
params: { destination: { x: 1, y: 2, z: 3 }, mount: mountName },
|
|
41
|
+
})
|
|
42
|
+
screen.getByText(`Moving ${mountName} mount to (X: 1, Y: 2, Z: 3)`)
|
|
43
|
+
})
|
|
44
|
+
)
|
|
45
|
+
|
|
46
|
+
it('should render moveAxesTo with all axes', () => {
|
|
47
|
+
render({
|
|
48
|
+
commandType: 'robot/moveAxesTo',
|
|
49
|
+
params: {
|
|
50
|
+
axis_map: {
|
|
51
|
+
x: 1,
|
|
52
|
+
y: 2,
|
|
53
|
+
leftZ: 3,
|
|
54
|
+
rightZ: 4,
|
|
55
|
+
extensionZ: 5,
|
|
56
|
+
leftPlunger: 6,
|
|
57
|
+
rightPlunger: 7,
|
|
58
|
+
extensionJaw: 8,
|
|
59
|
+
},
|
|
60
|
+
},
|
|
61
|
+
})
|
|
62
|
+
screen.getByText(
|
|
63
|
+
'Moving robot to (X: 1, Y: 2, left Z: 3, right Z: 4, extension Z: 5, left plunger: 6, right plunger: 7, extension jaw: 8)'
|
|
64
|
+
)
|
|
65
|
+
})
|
|
66
|
+
it('should render moveAxesTo with not all axes', () => {
|
|
67
|
+
render({
|
|
68
|
+
commandType: 'robot/moveAxesTo',
|
|
69
|
+
params: {
|
|
70
|
+
axis_map: {
|
|
71
|
+
x: 1,
|
|
72
|
+
rightZ: 4,
|
|
73
|
+
extensionZ: 5,
|
|
74
|
+
rightPlunger: 7,
|
|
75
|
+
},
|
|
76
|
+
},
|
|
77
|
+
})
|
|
78
|
+
screen.getByText(
|
|
79
|
+
'Moving robot to (X: 1, right Z: 4, extension Z: 5, right plunger: 7)'
|
|
80
|
+
)
|
|
81
|
+
})
|
|
82
|
+
it('should render moveAxesRelative with all axes', () => {
|
|
83
|
+
render({
|
|
84
|
+
commandType: 'robot/moveAxesRelative',
|
|
85
|
+
params: {
|
|
86
|
+
axis_map: {
|
|
87
|
+
x: 1,
|
|
88
|
+
y: 2,
|
|
89
|
+
leftZ: 3,
|
|
90
|
+
rightZ: 4,
|
|
91
|
+
extensionZ: 5,
|
|
92
|
+
leftPlunger: 6,
|
|
93
|
+
rightPlunger: 7,
|
|
94
|
+
extensionJaw: 8,
|
|
95
|
+
},
|
|
96
|
+
},
|
|
97
|
+
})
|
|
98
|
+
screen.getByText(
|
|
99
|
+
'Moving robot by (X: 1, Y: 2, left Z: 3, right Z: 4, extension Z: 5, left plunger: 6, right plunger: 7, extension jaw: 8)'
|
|
100
|
+
)
|
|
101
|
+
})
|
|
102
|
+
it('should render moveAxesRelative with not all axes', () => {
|
|
103
|
+
render({
|
|
104
|
+
commandType: 'robot/moveAxesRelative',
|
|
105
|
+
params: {
|
|
106
|
+
axis_map: {
|
|
107
|
+
x: 1,
|
|
108
|
+
rightZ: 4,
|
|
109
|
+
extensionZ: 5,
|
|
110
|
+
rightPlunger: 7,
|
|
111
|
+
},
|
|
112
|
+
},
|
|
113
|
+
})
|
|
114
|
+
screen.getByText(
|
|
115
|
+
'Moving robot by (X: 1, right Z: 4, extension Z: 5, right plunger: 7)'
|
|
116
|
+
)
|
|
117
|
+
})
|
|
118
|
+
})
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type {
|
|
2
|
-
AbsorbanceReaderOpenLidRunTimeCommand,
|
|
3
2
|
AbsorbanceReaderCloseLidRunTimeCommand,
|
|
4
3
|
AbsorbanceReaderInitializeRunTimeCommand,
|
|
4
|
+
AbsorbanceReaderOpenLidRunTimeCommand,
|
|
5
5
|
AbsorbanceReaderReadRunTimeCommand,
|
|
6
6
|
RunTimeCommand,
|
|
7
7
|
} from '@opentrons/shared-data'
|
|
@@ -1,9 +1,15 @@
|
|
|
1
|
+
import { getLabwareDefURI } from '@opentrons/shared-data'
|
|
2
|
+
|
|
3
|
+
import { getLabwareDisplayLocation } from '../../utils/getLabwareDisplayLocation'
|
|
4
|
+
|
|
1
5
|
import type {
|
|
6
|
+
FlexStackerEmptyRunTimeCommand,
|
|
7
|
+
FlexStackerFillRunTimeCommand,
|
|
8
|
+
FlexStackerRetrieveRunTimeCommand,
|
|
2
9
|
FlexStackerSetStoredLabwareRunTimeCommand,
|
|
3
10
|
FlexStackerStoreRunTimeCommand,
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
FlexStackerEmptyRunTimeCommand,
|
|
11
|
+
LabwareDefinition2,
|
|
12
|
+
LabwareDefinition3,
|
|
7
13
|
RunTimeCommand,
|
|
8
14
|
} from '@opentrons/shared-data'
|
|
9
15
|
import type { HandlesCommands } from '../types'
|
|
@@ -15,18 +21,148 @@ export type FlexStackerCommand =
|
|
|
15
21
|
| FlexStackerFillRunTimeCommand
|
|
16
22
|
| FlexStackerEmptyRunTimeCommand
|
|
17
23
|
|
|
24
|
+
export const KEYS_BY_COMMAND_TYPE: {
|
|
25
|
+
[commandType in FlexStackerCommand['commandType']]: string
|
|
26
|
+
} = {
|
|
27
|
+
'flexStacker/retrieve': 'flex_stacker_retrieve',
|
|
28
|
+
'flexStacker/store': 'flex_stacker_store',
|
|
29
|
+
'flexStacker/setStoredLabware': 'flex_stacker_set_stored_labware',
|
|
30
|
+
'flexStacker/empty': 'flex_stacker_empty',
|
|
31
|
+
'flexStacker/fill': 'flex_stacker_fill',
|
|
32
|
+
}
|
|
33
|
+
|
|
18
34
|
type HandledCommands = Extract<
|
|
19
35
|
RunTimeCommand,
|
|
20
|
-
{ commandType:
|
|
36
|
+
{ commandType: keyof typeof KEYS_BY_COMMAND_TYPE }
|
|
21
37
|
>
|
|
22
38
|
|
|
23
39
|
type GetFlexStackerCommandText = HandlesCommands<HandledCommands>
|
|
24
40
|
|
|
25
|
-
|
|
41
|
+
const getLabwareDisplayName = (labwareUri: string, allRunDefs: any): string => {
|
|
42
|
+
const currentLabwareDef = allRunDefs.find(
|
|
43
|
+
(def: LabwareDefinition2 | LabwareDefinition3) =>
|
|
44
|
+
getLabwareDefURI(def) === labwareUri
|
|
45
|
+
)
|
|
46
|
+
return currentLabwareDef?.metadata.displayName ?? null
|
|
47
|
+
}
|
|
48
|
+
|
|
26
49
|
export const getFlexStackerCommandText = ({
|
|
27
50
|
command,
|
|
51
|
+
allRunDefs,
|
|
52
|
+
commandTextData,
|
|
28
53
|
t,
|
|
54
|
+
robotType,
|
|
29
55
|
}: // stackerCommand,
|
|
30
56
|
GetFlexStackerCommandText): string => {
|
|
31
|
-
|
|
57
|
+
const primaryDefinitionDisplayName =
|
|
58
|
+
command.result !== undefined && 'primaryLabwareURI' in command?.result
|
|
59
|
+
? getLabwareDisplayName(
|
|
60
|
+
command?.result.primaryLabwareURI,
|
|
61
|
+
allRunDefs ?? []
|
|
62
|
+
)
|
|
63
|
+
: null
|
|
64
|
+
if (command.commandType === 'flexStacker/retrieve') {
|
|
65
|
+
const slotName = getLabwareDisplayLocation({
|
|
66
|
+
loadedLabwares: commandTextData?.labware ?? [],
|
|
67
|
+
location: command.result?.primaryLocationSequence,
|
|
68
|
+
robotType,
|
|
69
|
+
allRunDefs,
|
|
70
|
+
loadedModules: commandTextData?.modules ?? [],
|
|
71
|
+
t,
|
|
72
|
+
})
|
|
73
|
+
if (primaryDefinitionDisplayName != null && slotName != null) {
|
|
74
|
+
return t('branded:retrieve_labware_from_stacker_to', {
|
|
75
|
+
primaryDefinitionDisplayName,
|
|
76
|
+
slotName,
|
|
77
|
+
})
|
|
78
|
+
}
|
|
79
|
+
} else if (command.commandType === 'flexStacker/store') {
|
|
80
|
+
const slotName = getLabwareDisplayLocation({
|
|
81
|
+
loadedLabwares: commandTextData?.labware ?? [],
|
|
82
|
+
location: command.result?.primaryOriginLocationSequence ?? null,
|
|
83
|
+
robotType,
|
|
84
|
+
allRunDefs,
|
|
85
|
+
loadedModules: commandTextData?.modules ?? [],
|
|
86
|
+
t,
|
|
87
|
+
})
|
|
88
|
+
if (primaryDefinitionDisplayName != null && slotName != null) {
|
|
89
|
+
return t('branded:store_labware_from_slot_to_stacker', {
|
|
90
|
+
primaryDefinitionDisplayName,
|
|
91
|
+
slotName,
|
|
92
|
+
})
|
|
93
|
+
}
|
|
94
|
+
} else if (command.commandType === 'flexStacker/setStoredLabware') {
|
|
95
|
+
const slotName = getLabwareDisplayLocation({
|
|
96
|
+
loadedLabwares: commandTextData?.labware ?? [],
|
|
97
|
+
location: { moduleId: command.params?.moduleId },
|
|
98
|
+
robotType,
|
|
99
|
+
allRunDefs,
|
|
100
|
+
loadedModules: commandTextData?.modules ?? [],
|
|
101
|
+
t,
|
|
102
|
+
})
|
|
103
|
+
if (
|
|
104
|
+
command.result !== undefined &&
|
|
105
|
+
'primaryLabwareDefinition' in command.result &&
|
|
106
|
+
slotName != null
|
|
107
|
+
) {
|
|
108
|
+
return (
|
|
109
|
+
t(
|
|
110
|
+
'branded:flex_stacker_set_stored_labware_with_quantity_and_location',
|
|
111
|
+
{
|
|
112
|
+
quantity: command.params.initialCount,
|
|
113
|
+
stackerColumn: slotName,
|
|
114
|
+
labwareAndLidDisplayNames:
|
|
115
|
+
command.result?.primaryLabwareDefinition.metadata.displayName,
|
|
116
|
+
}
|
|
117
|
+
) +
|
|
118
|
+
(command.result?.lidLabwareDefinition != null
|
|
119
|
+
? t('with_lid_name', {
|
|
120
|
+
lidDisplayName:
|
|
121
|
+
command.result?.lidLabwareDefinition.metadata.displayName,
|
|
122
|
+
})
|
|
123
|
+
: '')
|
|
124
|
+
)
|
|
125
|
+
}
|
|
126
|
+
} else if (command.commandType === 'flexStacker/fill') {
|
|
127
|
+
const slotName = getLabwareDisplayLocation({
|
|
128
|
+
loadedLabwares: commandTextData?.labware ?? [],
|
|
129
|
+
location: { moduleId: command.params?.moduleId },
|
|
130
|
+
robotType,
|
|
131
|
+
allRunDefs,
|
|
132
|
+
loadedModules: commandTextData?.modules ?? [],
|
|
133
|
+
t,
|
|
134
|
+
})
|
|
135
|
+
if (primaryDefinitionDisplayName != null) {
|
|
136
|
+
return (
|
|
137
|
+
t('branded:flex_stacker_fill_with_quantity_and_labware', {
|
|
138
|
+
quantity: command.params.count,
|
|
139
|
+
stackerColumn: slotName,
|
|
140
|
+
labwareAndLidDisplayNames: primaryDefinitionDisplayName,
|
|
141
|
+
}) +
|
|
142
|
+
(command.result?.lidLabwareURI != null
|
|
143
|
+
? t('with_lid_name', {
|
|
144
|
+
lidDisplayName: getLabwareDisplayName(
|
|
145
|
+
command.result?.lidLabwareURI,
|
|
146
|
+
allRunDefs ?? []
|
|
147
|
+
),
|
|
148
|
+
})
|
|
149
|
+
: '')
|
|
150
|
+
)
|
|
151
|
+
}
|
|
152
|
+
} else if (command.commandType === 'flexStacker/empty') {
|
|
153
|
+
const slotName = getLabwareDisplayLocation({
|
|
154
|
+
loadedLabwares: commandTextData?.labware ?? [],
|
|
155
|
+
location: { moduleId: command.params?.moduleId },
|
|
156
|
+
robotType,
|
|
157
|
+
allRunDefs,
|
|
158
|
+
loadedModules: commandTextData?.modules ?? [],
|
|
159
|
+
t,
|
|
160
|
+
})
|
|
161
|
+
if (primaryDefinitionDisplayName != null && slotName != null) {
|
|
162
|
+
return t('branded:flex_stacker_empty_from_location', {
|
|
163
|
+
stackerColumn: slotName,
|
|
164
|
+
})
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
return t('branded:' + KEYS_BY_COMMAND_TYPE[command.commandType])
|
|
32
168
|
}
|
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/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
|
|
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'
|