Skip to content

Commit

Permalink
remove desktop app load fixture stubs and update types
Browse files Browse the repository at this point in the history
  • Loading branch information
brenthagen committed Nov 13, 2023
1 parent e83ce50 commit 2f8c544
Show file tree
Hide file tree
Showing 26 changed files with 278 additions and 351 deletions.
74 changes: 31 additions & 43 deletions api-client/src/deck_configuration/__stubs__/index.ts
Original file line number Diff line number Diff line change
@@ -1,73 +1,61 @@
import { v4 as uuidv4 } from 'uuid'

import {
STAGING_AREA_LOAD_NAME,
STANDARD_SLOT_LOAD_NAME,
TRASH_BIN_LOAD_NAME,
WASTE_CHUTE_LOAD_NAME,
SINGLE_LEFT_SLOT_FIXTURE,
SINGLE_CENTER_SLOT_FIXTURE,
SINGLE_RIGHT_SLOT_FIXTURE,
STAGING_AREA_RIGHT_SLOT_FIXTURE,
TRASH_BIN_ADAPTER_FIXTURE,
WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
} from '@opentrons/shared-data'

import type { Fixture } from '@opentrons/shared-data'

export const DECK_CONFIG_STUB: { [fixtureLocation: string]: Fixture } = {
export const DECK_CONFIG_STUB: { [cutoutId: string]: Fixture } = {
cutoutA1: {
fixtureLocation: 'cutoutA1',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutA1',
cutoutFixtureId: SINGLE_LEFT_SLOT_FIXTURE,
},
cutoutB1: {
fixtureLocation: 'cutoutB1',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutB1',
cutoutFixtureId: SINGLE_LEFT_SLOT_FIXTURE,
},
cutoutC1: {
fixtureLocation: 'cutoutC1',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutC1',
cutoutFixtureId: SINGLE_LEFT_SLOT_FIXTURE,
},
cutoutD1: {
fixtureLocation: 'cutoutD1',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutD1',
cutoutFixtureId: SINGLE_LEFT_SLOT_FIXTURE,
},
cutoutA2: {
fixtureLocation: 'cutoutA2',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutA2',
cutoutFixtureId: SINGLE_CENTER_SLOT_FIXTURE,
},
cutoutB2: {
fixtureLocation: 'cutoutB2',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutB2',
cutoutFixtureId: SINGLE_CENTER_SLOT_FIXTURE,
},
cutoutC2: {
fixtureLocation: 'cutoutC2',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutC2',
cutoutFixtureId: SINGLE_CENTER_SLOT_FIXTURE,
},
cutoutD2: {
fixtureLocation: 'cutoutD2',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutD2',
cutoutFixtureId: SINGLE_CENTER_SLOT_FIXTURE,
},
cutoutA3: {
fixtureLocation: 'cutoutA3',
loadName: TRASH_BIN_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutA3',
cutoutFixtureId: TRASH_BIN_ADAPTER_FIXTURE,
},
cutoutB3: {
fixtureLocation: 'cutoutB3',
loadName: STANDARD_SLOT_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutB3',
cutoutFixtureId: SINGLE_RIGHT_SLOT_FIXTURE,
},
cutoutC3: {
fixtureLocation: 'cutoutC3',
loadName: STAGING_AREA_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutC3',
cutoutFixtureId: STAGING_AREA_RIGHT_SLOT_FIXTURE,
},
cutoutD3: {
fixtureLocation: 'cutoutD3',
loadName: WASTE_CHUTE_LOAD_NAME,
fixtureId: uuidv4(),
cutoutId: 'cutoutD3',
cutoutFixtureId: WASTE_CHUTE_RIGHT_ADAPTER_NO_COVER_FIXTURE,
},
}
11 changes: 4 additions & 7 deletions api-client/src/deck_configuration/updateDeckConfiguration.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { v4 as uuidv4 } from 'uuid'

// import { PATCH, request } from '../request'
import { DECK_CONFIG_STUB } from './__stubs__'

Expand All @@ -23,10 +21,9 @@ import type { HostConfig } from '../types'

export function updateDeckConfiguration(
config: HostConfig,
data: Omit<Fixture, 'fixtureId'>
data: Fixture
): Promise<{ data: Fixture }> {
const { fixtureLocation } = data
const fixtureId = uuidv4()
DECK_CONFIG_STUB[fixtureLocation] = { ...data, fixtureId }
return Promise.resolve({ data: DECK_CONFIG_STUB[fixtureLocation] })
const { cutoutId } = data
DECK_CONFIG_STUB[cutoutId] = data
return Promise.resolve({ data: DECK_CONFIG_STUB[cutoutId] })
}
4 changes: 2 additions & 2 deletions app/src/molecules/DeckThumbnail/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {
} from '@opentrons/api-client'

import { getStandardDeckViewLayerBlockList } from './utils/getStandardDeckViewLayerBlockList'
import { getDeckConfigFromProtocolCommands } from '../../resources/deck_configuration/utils'
import { getSimplestDeckConfigForProtocolCommands } from '../../resources/deck_configuration/utils'
import { getLabwareRenderInfo } from '../../organisms/Devices/ProtocolRun/utils/getLabwareRenderInfo'
import { getProtocolModulesInfo } from '../../organisms/Devices/ProtocolRun/utils/getProtocolModulesInfo'
import { useAttachedModules } from '../../organisms/Devices/hooks'
Expand Down Expand Up @@ -43,7 +43,7 @@ export function DeckThumbnail(props: DeckThumbnailProps): JSX.Element | null {
protocolAnalysis.commands
)

const deckConfig = getDeckConfigFromProtocolCommands(
const deckConfig = getSimplestDeckConfigForProtocolCommands(
protocolAnalysis.commands
)
const liquids = protocolAnalysis.liquids
Expand Down
67 changes: 9 additions & 58 deletions app/src/organisms/Devices/ProtocolRun/ProtocolRunSetup.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import * as React from 'react'
import { useTranslation } from 'react-i18next'

import {
LoadedFixturesBySlot,
parseAllRequiredModuleModels,
} from '@opentrons/api-client'
import { parseAllRequiredModuleModels } from '@opentrons/api-client'
import {
Flex,
ALIGN_CENTER,
Expand All @@ -17,15 +14,11 @@ import {
TYPOGRAPHY,
Link,
} from '@opentrons/components'
import {
STAGING_AREA_LOAD_NAME,
TRASH_BIN_LOAD_NAME,
WASTE_CHUTE_LOAD_NAME,
} from '@opentrons/shared-data'

import { Line } from '../../../atoms/structure'
import { StyledText } from '../../../atoms/text'
import { InfoMessage } from '../../../molecules/InfoMessage'
import { getSimplestDeckConfigForProtocolCommands } from '../../../resources/deck_configuration/utils'
import {
useIsFlex,
useRobot,
Expand Down Expand Up @@ -76,52 +69,6 @@ export function ProtocolRunSetup({
const protocolData = robotProtocolAnalysis ?? storedProtocolAnalysis
const modules = parseAllRequiredModuleModels(protocolData?.commands ?? [])

// TODO(Jr, 10/4/23): stubbed in the fixtures for now - delete IMMEDIATELY
// const loadedFixturesBySlot = parseInitialLoadedFixturesByCutout(
// protocolData?.commands ?? []
// )

const STUBBED_LOAD_FIXTURE_BY_SLOT: LoadedFixturesBySlot = {
D3: {
id: 'stubbed_load_fixture',
commandType: 'loadFixture',
params: {
fixtureId: 'stubbedFixtureId',
loadName: WASTE_CHUTE_LOAD_NAME,
location: { cutout: 'cutoutD3' },
},
createdAt: 'fakeTimestamp',
startedAt: 'fakeTimestamp',
completedAt: 'fakeTimestamp',
status: 'succeeded',
},
B3: {
id: 'stubbed_load_fixture_2',
commandType: 'loadFixture',
params: {
fixtureId: 'stubbedFixtureId_2',
loadName: STAGING_AREA_LOAD_NAME,
location: { cutout: 'cutoutB3' },
},
createdAt: 'fakeTimestamp',
startedAt: 'fakeTimestamp',
completedAt: 'fakeTimestamp',
status: 'succeeded',
},
C3: {
id: 'stubbed_load_fixture_3',
commandType: 'loadFixture',
params: {
fixtureId: 'stubbedFixtureId_3',
loadName: TRASH_BIN_LOAD_NAME,
location: { cutout: 'cutoutC3' },
},
createdAt: 'fakeTimestamp',
startedAt: 'fakeTimestamp',
completedAt: 'fakeTimestamp',
status: 'succeeded',
},
}
const robot = useRobot(robotName)
const calibrationStatusRobot = useRunCalibrationStatus(robotName, runId)
const calibrationStatusModules = useModuleCalibrationStatus(robotName, runId)
Expand Down Expand Up @@ -168,8 +115,12 @@ export function ProtocolRunSetup({
if (robot == null) return null
const hasLiquids = protocolData != null && protocolData.liquids?.length > 0
const hasModules = protocolData != null && modules.length > 0
const hasFixtures =
protocolData != null && Object.keys(STUBBED_LOAD_FIXTURE_BY_SLOT).length > 0

const protocolDeckConfig = getSimplestDeckConfigForProtocolCommands(
protocolData?.commands ?? []
)

const hasFixtures = protocolDeckConfig.length > 0

let moduleDescription: string = t(`${MODULE_SETUP_KEY}_description`, {
count: modules.length,
Expand Down Expand Up @@ -213,7 +164,7 @@ export function ProtocolRunSetup({
expandLabwarePositionCheckStep={() => setExpandedStepKey(LPC_KEY)}
robotName={robotName}
runId={runId}
loadedFixturesBySlot={STUBBED_LOAD_FIXTURE_BY_SLOT}
protocolDeckConfig={protocolDeckConfig}
hasModules={hasModules}
/>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
} from '@opentrons/shared-data'

import { getLabwareSetupItemGroups } from '../../../../pages/Protocols/utils'
import { getDeckConfigFromProtocolCommands } from '../../../../resources/deck_configuration/utils'
import { getSimplestDeckConfigForProtocolCommands } from '../../../../resources/deck_configuration/utils'
import { getAttachedProtocolModuleMatches } from '../../../ProtocolSetupModulesAndDeck/utils'
import { useAttachedModules } from '../../hooks'
import { LabwareInfoOverlay } from '../LabwareInfoOverlay'
Expand Down Expand Up @@ -107,7 +107,7 @@ export function SetupLabwareMap({

const { offDeckItems } = getLabwareSetupItemGroups(commands)

const deckConfig = getDeckConfigFromProtocolCommands(
const deckConfig = getSimplestDeckConfigForProtocolCommands(
protocolAnalysis.commands
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { LabwareInfoOverlay } from '../LabwareInfoOverlay'
import { LiquidsLabwareDetailsModal } from './LiquidsLabwareDetailsModal'
import { getWellFillFromLabwareId } from './utils'
import { getLabwareRenderInfo } from '../utils/getLabwareRenderInfo'
import { getDeckConfigFromProtocolCommands } from '../../../../resources/deck_configuration/utils'
import { getSimplestDeckConfigForProtocolCommands } from '../../../../resources/deck_configuration/utils'
import { getStandardDeckViewLayerBlockList } from '../utils/getStandardDeckViewLayerBlockList'
import { getAttachedProtocolModuleMatches } from '../../../ProtocolSetupModulesAndDeck/utils'
import { getProtocolModulesInfo } from '../utils/getProtocolModulesInfo'
Expand Down Expand Up @@ -70,7 +70,7 @@ export function SetupLiquidsMap(
const labwareByLiquidId = parseLabwareInfoByLiquidId(
protocolAnalysis.commands ?? []
)
const deckConfig = getDeckConfigFromProtocolCommands(
const deckConfig = getSimplestDeckConfigForProtocolCommands(
protocolAnalysis.commands
)
const deckLayerBlocklist = getStandardDeckViewLayerBlockList(robotType)
Expand Down
Loading

0 comments on commit 2f8c544

Please sign in to comment.