Skip to content

Commit

Permalink
local-resources -> resources
Browse files Browse the repository at this point in the history
  • Loading branch information
mjhuff committed Nov 22, 2024
1 parent f55b2db commit abf9af0
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 19 deletions.
1 change: 0 additions & 1 deletion app/src/local-resources/instruments/hooks/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ export * from './useHomePipettes'
export * from './usePipetteModelSpecs'
export * from './usePipetteNameSpecs'
export * from './usePipetteSpecsv2'
export * from './useTipAttachmentStatus'
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import {
} from '/app/resources/runs'
import { isTerminalRunStatus } from '../../utils'
import { lastRunCommandPromptedErrorRecovery } from '/app/local-resources/commands'
import { useTipAttachmentStatus } from '/app/local-resources/instruments'
import { useTipAttachmentStatus } from '/app/resources/instruments'

import type { RobotType } from '@opentrons/shared-data'
import type { Run, RunStatus } from '@opentrons/api-client'
import type { PipetteWithTip } from '/app/local-resources/instruments'
import type { PipetteWithTip } from '/app/resources/instruments'
import type { DropTipWizardFlowsProps } from '/app/organisms/DropTipWizardFlows'
import type { UseProtocolDropTipModalResult } from '../modals'
import type { PipetteDetails } from '/app/resources/maintenance_runs'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,8 @@ import { useHomePipettes } from '/app/local-resources/instruments'

import type { PipetteData } from '@opentrons/api-client'
import type { IconProps } from '@opentrons/components'
import type {
UseHomePipettesProps,
TipAttachmentStatusResult,
} from '/app/local-resources/instruments'
import type { UseHomePipettesProps } from '/app/local-resources/instruments'
import type { TipAttachmentStatusResult } from '/app/resources/instruments'

type UseProtocolDropTipModalProps = Pick<
UseHomePipettesProps,
Expand Down
6 changes: 2 additions & 4 deletions app/src/organisms/DropTipWizardFlows/TipsAttachedModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ import { useHomePipettes } from '/app/local-resources/instruments'

import type { HostConfig } from '@opentrons/api-client'
import type { OddModalHeaderBaseProps } from '/app/molecules/OddModal/types'
import type {
UseHomePipettesProps,
PipetteWithTip,
} from '/app/local-resources/instruments'
import type { UseHomePipettesProps } from '/app/local-resources/instruments'
import type { PipetteDetails } from '/app/resources/maintenance_runs'
import type { PipetteWithTip } from '/app/resources/instruments'

type TipsAttachedModalProps = Pick<UseHomePipettesProps, 'onSettled'> & {
aPipetteWithTip: PipetteWithTip
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { useDropTipWizardFlows } from '..'
import type { Mock } from 'vitest'
import type { PipetteModelSpecs } from '@opentrons/shared-data'
import type { HostConfig } from '@opentrons/api-client'
import type { PipetteWithTip } from '/app/local-resources/instruments'
import type { PipetteWithTip } from '/app/resources/instruments'

vi.mock('/app/resources/runs/useCloseCurrentRun')
vi.mock('..')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import { SelectRecoveryOption } from './SelectRecoveryOption'

import type { RecoveryContentProps, RecoveryRoute, RouteStep } from '../types'
import type { FixitCommandTypeUtils } from '/app/organisms/DropTipWizardFlows'
import type { PipetteWithTip } from '/app/local-resources/instruments'
import type { PipetteWithTip } from '/app/resources/instruments'

// The Drop Tip flow entry point. Includes entry from SelectRecoveryOption and CancelRun.
export function ManageTips(props: RecoveryContentProps): JSX.Element {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
import { RecoverySingleColumnContentWrapper } from '../shared'

import type { ErrorKind, RecoveryContentProps, RecoveryRoute } from '../types'
import type { PipetteWithTip } from '/app/local-resources/instruments'
import type { PipetteWithTip } from '/app/resources/instruments'

// The "home" route within Error Recovery. When a user completes a non-terminal flow or presses "Go back" enough
// to escape the boundaries of any route, they will be redirected here.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ import head from 'lodash/head'

import { useRunCurrentState } from '@opentrons/react-api-client'
import { getPipetteModelSpecs } from '@opentrons/shared-data'
import { useTipAttachmentStatus } from '/app/local-resources/instruments/hooks'
import { useTipAttachmentStatus } from '/app/resources/instruments'
import { ERROR_KINDS } from '/app/organisms/ErrorRecoveryFlows/constants'
import { getErrorKind } from '/app/organisms/ErrorRecoveryFlows/utils'

import type { Run, Instruments, PipetteData } from '@opentrons/api-client'
import type {
PipetteWithTip,
TipAttachmentStatusResult,
} from '/app/local-resources/instruments/hooks'
} from '/app/resources/instruments'
import type { ERUtilsProps } from '/app/organisms/ErrorRecoveryFlows/hooks/useERUtils'

interface UseRecoveryTipStatusProps {
Expand Down
4 changes: 2 additions & 2 deletions app/src/pages/ODD/RunSummary/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@ import {
} from '/app/resources/runs'
import { handleTipsAttachedModal } from '/app/organisms/DropTipWizardFlows'
import { lastRunCommandPromptedErrorRecovery } from '/app/local-resources/commands'
import { useTipAttachmentStatus } from '/app/local-resources/instruments'
import { useTipAttachmentStatus } from '/app/resources/instruments'

import type { IconName } from '@opentrons/components'
import type { OnDeviceRouteParams } from '/app/App/types'
import type { PipetteWithTip } from '/app/local-resources/instruments'
import type { PipetteWithTip } from '/app/resources/instruments'

export function RunSummary(): JSX.Element {
const { runId } = useParams<
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getPipetteModelSpecs } from '@opentrons/shared-data'
import { useHost } from '@opentrons/react-api-client'

import { mockPipetteInfo } from '/app/redux/pipettes/__fixtures__'
import { useTipAttachmentStatus } from '../hooks'
import { useTipAttachmentStatus } from '../useTipAttachmentStatus'

import type { PipetteModelSpecs } from '@opentrons/shared-data'
import type { PipetteData } from '@opentrons/api-client'
Expand Down
1 change: 1 addition & 0 deletions app/src/resources/instruments/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './useAttachedPipettes'
export * from './useAttachedPipetteCalibrations'
export * from './useAttachedPipettesFromInstrumentsQuery'
export * from './useTipAttachmentStatus'

0 comments on commit abf9af0

Please sign in to comment.