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

refactor(app): replace RobotWorkSpace with BaseDeck for ProtocolSetup Liquids #13887

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import isEqual from 'lodash/isEqual'
import { getLoadedLabwareDefinitionsByUri } from '@opentrons/shared-data'
import { getLabwareDefinitionUri } from '../../organisms/Devices/ProtocolRun/utils/getLabwareDefinitionUri'
import {
getLabwareDefinitionUri,
getLabwareOffsetLocation,
} from '../../organisms/Devices/ProtocolRun/utils'
import { LabwareOffset } from '@opentrons/api-client'
import { getLabwareOffsetLocation } from '../../organisms/Devices/ProtocolRun/utils/getLabwareOffsetLocation'

import type {
LoadedLabware,
LoadedModule,
Expand Down
2 changes: 2 additions & 0 deletions app/src/organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export function ProtocolRunSetup({
const storedProtocolAnalysis = useStoredProtocolAnalysis(runId)
const protocolData = robotProtocolAnalysis ?? storedProtocolAnalysis
const modules = parseAllRequiredModuleModels(protocolData?.commands ?? [])
const protocolAnalysis = robotProtocolAnalysis ?? storedProtocolAnalysis

// TODO(Jr, 10/4/23): stubbed in the fixtures for now - delete IMMEDIATELY
// const loadedFixturesBySlot = parseInitialLoadedFixturesByCutout(
Expand Down Expand Up @@ -251,6 +252,7 @@ export function ProtocolRunSetup({
protocolRunHeaderRef={protocolRunHeaderRef}
robotName={robotName}
runId={runId}
protocolAnalysis={protocolAnalysis}
/>
),
description: hasLiquids
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import type {
} from '@opentrons/shared-data'
import type { ModuleRenderInfoForProtocol } from '../../hooks'
import type { LabwareSetupItem } from '../../../../pages/Protocols/utils'
import type { ModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention'
import type { ModuleTypesThatRequireExtraAttention } from '../utils'
import type { NestedLabwareInfo } from './getNestedLabwareInfo'

const LabwareRow = styled.div`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import { StyledText } from '../../../../atoms/text'
import { LegacyModal } from '../../../../molecules/LegacyModal'
import secureMagModBracketImage from '../../../../assets/images/secure_mag_mod_bracket.png'
import secureTCLatchImage from '../../../../assets/images/secure_tc_latch.png'
import { getModuleName } from '../utils/getModuleName'
import { getModuleName } from '../utils'

import type { ModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention'
import type { ModuleTypesThatRequireExtraAttention } from '../utils'

interface SecureLabwareModalProps {
onCloseClick: () => unknown
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { OffDeckLabwareList } from './OffDeckLabwareList'
import { getNestedLabwareInfo } from './getNestedLabwareInfo'

import type { ModuleRenderInfoForProtocol } from '../../hooks'
import type { ModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention'
import type { ModuleTypesThatRequireExtraAttention } from '../utils'

const HeaderRow = styled.div`
display: grid;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import { getDeckConfigFromProtocolCommands } from '../../../../resources/deck_co
import { getAttachedProtocolModuleMatches } from '../../../ProtocolSetupModulesAndDeck/utils'
import { useAttachedModules } from '../../hooks'
import { LabwareInfoOverlay } from '../LabwareInfoOverlay'
import { getLabwareRenderInfo } from '../utils/getLabwareRenderInfo'
import { getProtocolModulesInfo } from '../utils/getProtocolModulesInfo'
import { getLabwareRenderInfo, getProtocolModulesInfo } from '../utils'
import { getStandardDeckViewLayerBlockList } from '../utils/getStandardDeckViewLayerBlockList'
import { OffDeckLabwareList } from './OffDeckLabwareList'

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { renderWithProviders } from '@opentrons/components'
import { i18n } from '../../../../../i18n'
import { useLPCSuccessToast } from '../../../hooks/useLPCSuccessToast'
import { LabwarePositionCheck } from '../../../../LabwarePositionCheck'
import { getModuleTypesThatRequireExtraAttention } from '../../utils/getModuleTypesThatRequireExtraAttention'
import { getModuleTypesThatRequireExtraAttention } from '../../utils'
import { getIsLabwareOffsetCodeSnippetsOn } from '../../../../../redux/config'
import {
useLPCDisabledReason,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
DIRECTION_COLUMN,
} from '@opentrons/components'
import { useToggleGroup } from '../../../../molecules/ToggleGroup/useToggleGroup'
import { getModuleTypesThatRequireExtraAttention } from '../utils/getModuleTypesThatRequireExtraAttention'
import { getModuleTypesThatRequireExtraAttention } from '../utils'
import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
import {
useIsFlex,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
useProtocolAnalysisAsDocumentQuery,
} from '@opentrons/react-api-client'
import { useLPCSuccessToast } from '../../../hooks/useLPCSuccessToast'
import { getModuleTypesThatRequireExtraAttention } from '../../utils/getModuleTypesThatRequireExtraAttention'
import { getModuleTypesThatRequireExtraAttention } from '../../utils'
import { useLaunchLPC } from '../../../../LabwarePositionCheck/useLaunchLPC'
import { getIsLabwareOffsetCodeSnippetsOn } from '../../../../../redux/config'
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ import { getIsOnDevice } from '../../../../redux/config'
import { useMostRecentCompletedAnalysis } from '../../../LabwarePositionCheck/useMostRecentCompletedAnalysis'
import { LegacyModal } from '../../../../molecules/LegacyModal'
import { StyledText } from '../../../../atoms/text'
import { getLocationInfoNames } from '../utils/getLocationInfoNames'
import { getSlotLabwareDefinition } from '../utils/getSlotLabwareDefinition'
import { getLocationInfoNames, getSlotLabwareDefinition } from '../utils'
import { LiquidDetailCard } from './LiquidDetailCard'
import {
getLiquidsByIdForLabware,
Expand Down
Loading
Loading