Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(components): create base deck fixture components #13758

Merged
merged 13 commits into from
Oct 12, 2023

Conversation

brenthagen
Copy link
Contributor

@brenthagen brenthagen commented Oct 11, 2023

Overview

creates single slot, staging area, waste chute, and waste chute staging area components to be used by the existing BaseDeck component. BaseDeck now receives a deckConfig prop describing a robot deck configuration of fixtures. the deck fixture components render SVGs corresponding to the fixture areas and slot clips provided by each fixture type. positioning and sizing subject to future adjustment.

updates various props in various places to use the Cutout type from shared-data for fixtureLocation

waste chute fixture foreign object representation is based on a design provided by Rob but not finalized

Screen Shot 2023-10-11 at 3 11 27 PM

closes RAUT-783

Test Plan

  • verified sizing and layout of fixture components in storybook

Changelog

  • Creates base deck fixture components

Review requests

run storybook, take a look

Risk assessment

low, BaseDeck unused in the app (for now)

creates single slot, staging area, and waste chute components to be used by the existing BaseDeck
component. BaseDeck now receives a deckConfig prop describing a robot deck configuration of fixures.
the deck fixture components render SVGs corresponding to the fixture areas and slot clips provided
by each fixture type

closes RAUT-783
@codecov
Copy link

codecov bot commented Oct 11, 2023

Codecov Report

Merging #13758 (8c60169) into edge (ddecec1) will decrease coverage by 0.17%.
Report is 1 commits behind head on edge.
The diff coverage is 5.33%.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             edge   #13758      +/-   ##
==========================================
- Coverage   70.90%   70.73%   -0.17%     
==========================================
  Files        2456     2471      +15     
  Lines       69132    69433     +301     
  Branches     8284     8383      +99     
==========================================
+ Hits        49016    49113      +97     
- Misses      18159    18358     +199     
- Partials     1957     1962       +5     
Flag Coverage Δ
app 68.30% <60.00%> (-0.40%) ⬇️
components 56.57% <0.00%> (-1.84%) ⬇️
labware-library 49.17% <ø> (ø)
protocol-designer 45.60% <50.00%> (ø)
shared-data 74.22% <ø> (ø)
step-generation 84.99% <ø> (ø)

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

Files Coverage Δ
...ilsDeckConfiguration/AddDeckConfigurationModal.tsx 95.45% <ø> (ø)
...organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx 77.92% <ø> (ø)
...olRun/SetupModuleAndDeck/LocationConflictModal.tsx 87.50% <ø> (ø)
...tocolRun/SetupModuleAndDeck/NotConfiguredModal.tsx 100.00% <ø> (ø)
...rotocolRun/SetupModuleAndDeck/SetupFixtureList.tsx 81.48% <ø> (-0.67%) ⬇️
...rotocolRun/SetupModuleAndDeck/SetupModulesList.tsx 81.81% <ø> (ø)
app/src/resources/deck_configuration/hooks.ts 93.33% <ø> (ø)
...onents/src/hardware-sim/Deck/MoveLabwareOnDeck.tsx 9.80% <ø> (ø)
...omponents/src/hardware-sim/Deck/RobotWorkSpace.tsx 0.00% <ø> (ø)
...rdware-sim/DeckConfigurator/EmptyConfigFixture.tsx 7.14% <ø> (ø)
... and 18 more

... and 14 files with indirect coverage changes

@brenthagen brenthagen marked this pull request as ready for review October 11, 2023 19:16
@brenthagen brenthagen requested review from a team as code owners October 11, 2023 19:16
@brenthagen brenthagen requested review from a team and b-cooper and removed request for a team and b-cooper October 11, 2023 19:16
Copy link
Collaborator

@jerader jerader left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

WOW it looks so good!!! 💅🤩 can't wait for BaseDeck to be wired up throughout the app.

interface NotConfiguredModalProps {
onCloseClick: () => void
requiredFixture: FixtureLoadName
cutout: string
cutout: Cutout
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops thanks for fixing this!

Comment on lines +32 to +33
// import { WasteChuteStagingAreaFixture } from './WasteChuteStagingAreaFixture'

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wasteChuteStagingAreaFixture to be added later?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yep, we'll have to add the waste chute staging area as a load name and option in various places also. that all should be a separate ticket i think

import type { WizardTileProps } from './types'

const STAGING_AREA_SLOTS = ['A3', 'B3', 'C3', 'D3']
const STAGING_AREA_SLOTS: Cutout[] = ['A3', 'B3', 'C3', 'D3']
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nice!

import type { ModalHeaderBaseProps } from '../../molecules/Modal/types'
import type { LegacyModalProps } from '../../molecules/LegacyModal'

interface AddDeckConfigurationModalProps {
fixtureLocation: string
fixtureLocation: Cutout
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

DeckConfiguration,
FLEX_ROBOT_TYPE,
LabwareDefinition2,
} from '@opentrons/shared-data'

import type { Meta, StoryObj } from '@storybook/react'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move down import type?

return (
<path
fill="none"
stroke="#16212D"
Copy link
Contributor

@koji koji Oct 11, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit

Suggested change
stroke="#16212D"
stroke={COLORS.darkBlackEnabled}

Copy link
Contributor

@koji koji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@brenthagen brenthagen merged commit 3e2ed65 into edge Oct 12, 2023
61 of 63 checks passed
@brenthagen brenthagen deleted the components_base-deck-fixture-components branch October 12, 2023 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants